Attachment 132308 Details for Bug 176564 – x11_xorg-edit.diff

[patch] x11_xorg-edit.diff

x11_xorg-edit.diff (text/x-diff), 6.00 KB, created by tkato432 on 2013-03-06 17:45:27 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: tkato432

Created: 2013-03-06 17:45:27 UTC

Size: 6.00 KB

patch

obsolete

>diff -urN /usr/ports/x11/xorg-edit/Makefile x11/xorg-edit/Makefile
>--- /usr/ports/x11/xorg-edit/Makefile	2012-11-08 10:12:51.000000000 +0900
>+++ x11/xorg-edit/Makefile	2013-03-02 14:22:16.000000000 +0900
>@@ -1,36 +1,72 @@
>-# New ports collection makefile for:	xorg-edit
>-# Date created:		4 August 2006
>-# Whom:			Andrew Pantyukhin <infofarmer@FreeBSD.org>
>-#
>+# Created by: Andrew Pantyukhin <infofarmer@FreeBSD.org>
> # $FreeBSD: head/x11/xorg-edit/Makefile 300897 2012-07-14 14:29:18Z beat $
>-#
> 
> PORTNAME=	xorg-edit
>-PORTVERSION=	07.08.11
>-PORTREVISION=	5
>+PORTVERSION=	08.08.06
> CATEGORIES=	x11
> MASTER_SITES=	SF
>-DISTNAME=	${PORTNAME}_${PORTVERSION}_src
>+DISTNAME=	${PORTNAME}-${PORTVERSION}_src
> 
> MAINTAINER=	ports@FreeBSD.org
> COMMENT=	GUI to edit xorg.conf
> 
>-USE_WX=		2.6
>+LICENSE=	GPLv3
>+
>+WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
>+
> USE_BZIP2=	yes
>+USE_DOS2UNIX=	*.cpp *.h
>+USE_WX=		2.6+
> WX_UNICODE=	yes
>-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
>-#BUILD_WRKSRC=	${WRKSRC}/sources
>-PLIST_FILES=	bin/${PORTNAME}
>+USE_GMAKE=	yes
>+MAKE_JOBS_SAFE=	yes
>+
>+PLIST_FILES=	bin/xorg-edit \
>+		lib/xorg-edit/de_DE/LC_MESSAGES/xorg-edit.mo \
>+		lib/xorg-edit/options/devices/example.xml \
>+		lib/xorg-edit/options/devices/list.xml \
>+		lib/xorg-edit/options/devices/nvidia.xml \
>+		lib/xorg-edit/xorg-edit
>+PLIST_DIRS=	lib/xorg-edit/options/devices \
>+		lib/xorg-edit/options \
>+		lib/xorg-edit/de_DE/LC_MESSAGES \
>+		lib/xorg-edit/de_DE \
>+		lib/xorg-edit
> 
>-post-extract:
>-	@${CHMOD} -R a+rX,u+w ${WRKSRC}
>+DESKTOP_ENTRIES="Xorg Edit" "" "" "${PORTNAME}" "Settings;" true
> 
> post-patch:
>-	@${REINPLACE_CMD} -e 's|wx-config|${WX_CONFIG}|g;s|/usr/local|$${PREFIX}|g'\
>-		${BUILD_WRKSRC}/xorgedit/${MAKEFILE}
>-	@${REINPLACE_CMD} -e '/^CXX.*=/d' ${BUILD_WRKSRC}/libxorgedit/Makefile
>+	@${REINPLACE_CMD} -e \
>+		's|^CXX =|CXX ?=| ; \
>+		 s|^CXXFLAGS =|CXXFLAGS ?=|' ${WRKSRC}/libxorgedit/Makefile
>+	@${REINPLACE_CMD} -e \
>+		's|^CXXFLAGS =|CXXFLAGS +=| ; \
>+		 s|wx-config|$$(WX_CONFIG)| ; \
>+		 s|-O3|| ; \
>+		 s|^CXX =|CXX ?=| ; \
>+		 s|^LDFLAGS =|LDFLAGS +=| ; \
>+		 s|^$$(OBJECTS).*|%.o: %.c|' ${WRKSRC}/xorgedit/Makefile
>+
>+do-configure:
>+	@${ECHO_CMD} -n > ${WRKDIR}/xorg-edit
>+	@${ECHO_CMD} '#!/bin/sh' >> ${WRKDIR}/xorg-edit
>+	@${ECHO_CMD} 'cd ${PREFIX}/lib/xorg-edit && ./xorg-edit "$$@"' \
>+		>> ${WRKDIR}/xorg-edit
>+	@${ECHO_CMD} -n > ${WRKSRC}/Makefile
>+	@${ECHO_CMD} 'all:' >> ${WRKSRC}/Makefile
>+	@${ECHO_CMD} '	$$(MAKE) -C libxorgedit' >> ${WRKSRC}/Makefile
>+	@${ECHO_CMD} '	$$(MAKE) -C xorgedit' >> ${WRKSRC}/Makefile
> 
> do-install:
>-	@${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin/
>+	(cd ${WRKDIR} && ${INSTALL_SCRIPT} xorg-edit ${PREFIX}/bin)
>+	@${MKDIR} ${PREFIX}/lib/xorg-edit
>+	(cd ${WRKSRC} && ${INSTALL_PROGRAM} xorg-edit \
>+		${PREFIX}/lib/xorg-edit)
>+	@${MKDIR} ${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
>+	(cd ${WRKSRC}/options/devices && ${INSTALL_DATA} *.xml \
>+		${PREFIX}/lib/xorg-edit/options/devices)
> 
> .include <bsd.port.mk>
>diff -urN /usr/ports/x11/xorg-edit/distinfo x11/xorg-edit/distinfo
>--- /usr/ports/x11/xorg-edit/distinfo	2012-11-08 10:12:51.000000000 +0900
>+++ x11/xorg-edit/distinfo	2013-02-18 03:53:51.000000000 +0900
>@@ -1,2 +1,2 @@
>-SHA256 (xorg-edit_07.08.11_src.tar.bz2) = 96d0001b47bc0ff7e15f65e83714675206a3834ec8016615b1137d2c200fa1b1
>-SIZE (xorg-edit_07.08.11_src.tar.bz2) = 100616
>+SHA256 (xorg-edit-08.08.06_src.tar.bz2) = 93b189c276df9bae9d9bfbb4212a068aad53b524af6615d1dad7003ee5857967
>+SIZE (xorg-edit-08.08.06_src.tar.bz2) = 101654
>diff -urN /usr/ports/x11/xorg-edit/files/patch-xorgedit__guiframe.cpp x11/xorg-edit/files/patch-xorgedit__guiframe.cpp
>--- /usr/ports/x11/xorg-edit/files/patch-xorgedit__guiframe.cpp	1970-01-01 09:00:00.000000000 +0900
>+++ x11/xorg-edit/files/patch-xorgedit__guiframe.cpp	2013-03-05 21:56:22.000000000 +0900
>@@ -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)
>diff -urN /usr/ports/x11/xorg-edit/pkg-descr x11/xorg-edit/pkg-descr
>--- /usr/ports/x11/xorg-edit/pkg-descr	2012-11-08 10:12:51.000000000 +0900
>+++ x11/xorg-edit/pkg-descr	2013-02-18 04:17:28.000000000 +0900
>@@ -1 +1,3 @@
> GUI to edit XServer-file xorg.conf easily
>+
>+WWW: http://www.deesaster.org/progxorg.php

Actions: View | Diff

Attachments on bug 176564: 132307 | 132308