Attachment 154307 Details for Bug 198359 – Proposed patch (since 373227 revision)

[patch] Proposed patch (since 373227 revision)

upp_5485,2-8227.diff (text/plain), 9.05 KB, created by lightside on 2015-03-15 00:10:32 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: lightside

Created: 2015-03-15 00:10:32 UTC

Size: 9.05 KB

patch

obsolete

>diff -ruN upp.orig/Makefile upp/Makefile
>--- upp.orig/Makefile	2014-11-24 21:41:10.000000000 +0400
>+++ upp/Makefile	2015-03-08 03:23:18.000000000 +0400
>@@ -2,29 +2,29 @@
> # $FreeBSD: head/devel/upp/Makefile 373227 2014-11-24 17:41:10Z mat $
> 
> PORTNAME=	upp
>-PORTVERSION=	5485
>-PORTREVISION=	2
>+PORTVERSION=	8227
> CATEGORIES=	devel x11-toolkits
>-MASTER_SITES=	SF
>+MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/2015.1/
> DISTNAME=	${PORTNAME}-x11-src-${PORTVERSION}
> 
> MAINTAINER=	m.sund@arcor.de
> COMMENT=	Ultimate++, a BSD-licensed, cross-platform, C/C++ RAD suite
> 
> LICENSE=	BSD2CLAUSE
>+LICENSE_FILE=	${BUILD_WRKSRC}/Core/Copying
> 
> LIB_DEPENDS=	libfreetype.so:${PORTSDIR}/print/freetype2 \
> 		libexpat.so:${PORTSDIR}/textproc/expat2 \
> 		libnotify.so:${PORTSDIR}/devel/libnotify
> 
>-USES=		gmake
>+USES=		execinfo gmake
> USE_XORG=	xft
> USE_GNOME=	gtk20
> 
> WRKSRC=		${WRKDIR}/${DISTNAME}
> BUILD_WRKSRC=	${WRKSRC}/uppsrc
> 
>-MACRO_FLAGS=	-DflagGUI -DflagGCC -DflagSHARED -DflagPOSIX -DflagBSD -DflagFREEBSD
>+MACRO_FLAGS=	-DflagGUI -DflagMT -DflagGCC -DflagSHARED -DflagPOSIX -DflagBSD -DflagFREEBSD
> 
> MAKE_ARGS=	UPPOUT="../_out/" OutFile="../theide" \
> 		Macro="${MACRO_FLAGS}" \
>@@ -33,10 +33,9 @@
> 		-I${LOCALBASE}/include/gtk-2.0 -I${LOCALBASE}/include/atk-1.0 \
> 		-I${LOCALBASE}/include/cairo -I${LOCALBASE}/include/gdk-pixbuf-2.0 \
> 		-I${LOCALBASE}/include/pango-1.0 -I${LOCALBASE}/include/glib-2.0 \
>-		-I${LOCALBASE}/lib/glib-2.0/include \
>-		-I${LOCALBASE}/include/libpng -I/usr/include"
>+		-I${LOCALBASE}/lib/glib-2.0/include -I/usr/include"
> 
>-PORTDATA=	bazaar examples reference tutorial uppsrc GCC.bm
>+PORTDATA=	bazaar examples reference tutorial uppsrc *.bm
> 
> DESKTOP_ENTRIES="TheIDE" "IDE for cross-platform C++ development" \
> 		"${DATADIR}/uppsrc/ide/theide-48.png" "theide" \
>@@ -62,13 +61,12 @@
> BROKEN=		Does not compile on ia64, powerpc, or sparc64
> .endif
> 
>-pre-build: .SILENT
>+post-patch: .SILENT
> 	${MV} ${BUILD_WRKSRC}/Makefile.in ${BUILD_WRKSRC}/Makefile
>-	${REINPLACE_CMD} -e '/^CC =/d;/^CFLAGS =/d;/^CXXFLAGS =/d;/^LDFLAGS =/d' \
>-	-e 's|$$(CC)|$$(CXX)|' \
>-	-e 's|-Linux-|-BSD-FreeBSD-|' \
>-	-e 's|-ldl|-lXau -lXdmcp -lfreetype -lexpat -lxcb -lpng|' \
>-	${BUILD_WRKSRC}/Makefile
>+	${REINPLACE_CMD} -e '/^CXX =/d;/^CFLAGS =/d;/^CXXFLAGS =/d;/^LDFLAGS =/d' \
>+		-e 's|-Linux-|-BSD-FreeBSD-|' \
>+		-e 's|-ldl|-lXau -lXdmcp -lfreetype -lexpat -lxcb -lpng -lexecinfo|' \
>+		${BUILD_WRKSRC}/Makefile
> 
> post-build: .SILENT
> 	${ECHO_CMD} "BUILDER = \"GCC\"" > ${WRKSRC}/GCC.bm
>@@ -80,21 +78,23 @@
> 	${ECHO_CMD} "DEBUG_LINK = \"\";" >> ${WRKSRC}/GCC.bm
> 	${ECHO_CMD} "RELEASE_BLITZ = \"0\";" >> ${WRKSRC}/GCC.bm
> 	${ECHO_CMD} "RELEASE_LINKMODE = \"1\";" >> ${WRKSRC}/GCC.bm
>-	${ECHO_CMD} "RELEASE_OPTIONS = \"-O2 -ffunction-sections\";" >> ${WRKSRC}/GCC.bm
>-	${ECHO_CMD} "RELEASE_SIZE_OPTIONS = \"-Os -finline-limit=20 -ffunction-sections\";" >> ${WRKSRC}/GCC.bm
>+	${ECHO_CMD} "RELEASE_OPTIONS = \"-O2 -ffunction-sections -fdata-sections\";" >> ${WRKSRC}/GCC.bm
>+	${ECHO_CMD} "RELEASE_SIZE_OPTIONS = \"-Os -finline-limit=20 -ffunction-sections -fdata-sections\";" >> ${WRKSRC}/GCC.bm
>+	${ECHO_CMD} "RELEASE_FLAGS = \"\";" >> ${WRKSRC}/GCC.bm
>+	${ECHO_CMD} "RELEASE_LINK = \"-Wl,--gc-sections\";" >> ${WRKSRC}/GCC.bm
> 	${ECHO_CMD} "DEBUGGER = \"gdb\";" >> ${WRKSRC}/GCC.bm
> 	${ECHO_CMD} "PATH = \"\";" >> ${WRKSRC}/GCC.bm
>-	${ECHO_CMD} "INCLUDE = \"${LOCALBASE}/include;${LOCALBASE}/include/freetype2;${LOCALBASE}/include/gtk-2.0;${LOCALBASE}/include/atk-1.0;${LOCALBASE}/include/cairo;${LOCALBASE}/include/gdk-pixbuf-2.0;${LOCALBASE}/include/pango-1.0;${LOCALBASE}/include/glib-2.0;${LOCALBASE}/include/libpng;/usr/include\";" >> ${WRKSRC}/GCC.bm
>+	${ECHO_CMD} "INCLUDE = \"${LOCALBASE}/include;${LOCALBASE}/include/freetype2;${LOCALBASE}/include/gtk-2.0;${LOCALBASE}/include/atk-1.0;${LOCALBASE}/include/cairo;${LOCALBASE}/include/gdk-pixbuf-2.0;${LOCALBASE}/include/pango-1.0;${LOCALBASE}/include/glib-2.0;${LOCALBASE}/lib/glib-2.0/include;/usr/include\";" >> ${WRKSRC}/GCC.bm
> 	${ECHO_CMD} "LIB = \"${LOCALBASE}/lib;/usr/lib\";" >> ${WRKSRC}/GCC.bm
>-	${ECHO_CMD} "REMOTE_HOST = \"\";" >> ${WRKSRC}/GCC.bm
>-	${ECHO_CMD} "REMOTE_OS = \"\";" >> ${WRKSRC}/GCC.bm
>-	${ECHO_CMD} "REMOTE_TRANSFER = \"\";" >> ${WRKSRC}/GCC.bm
>-	${ECHO_CMD} "REMOTE_MAP = \"\";" >> ${WRKSRC}/GCC.bm
> 	${ECHO_CMD} "LINKMODE_LOCK = \"0\";" >> ${WRKSRC}/GCC.bm
>+# Also create CLANG build method, based on GCC with some changes
>+	(cd ${WRKSRC} && ${CP} GCC.bm CLANG.bm && \
>+		${SED} -i '' -e '/^BUILDER/s|GCC|CLANG| ; \
>+		s| -fdata-sections|| ; s| -finline-limit=20||' CLANG.bm)
> 
> do-install:
> 	${INSTALL_PROGRAM} ${WRKSRC}/theide ${STAGEDIR}${PREFIX}/bin
>-	${MKDIR} ${STAGEDIR}${DATADIR}
>-	cd ${WRKSRC} && ${COPYTREE_SHARE} "${PORTDATA}" ${STAGEDIR}${DATADIR}
>+	(cd ${WRKSRC} && ${COPYTREE_SHARE} "${PORTDATA} -not ( -type d -empty )" \
>+		${STAGEDIR}${DATADIR})
> 
> .include <bsd.port.mk>
>diff -ruN upp.orig/distinfo upp/distinfo
>--- upp.orig/distinfo	2014-01-22 19:30:13.000000000 +0400
>+++ upp/distinfo	2015-03-06 15:22:45.000000000 +0400
>@@ -1,2 +1,2 @@
>-SHA256 (upp-x11-src-5485.tar.gz) = d6f9c5991c7aceb9df71d5723fd3b591c3201c05b05795eb063bc634dc5a0bb1
>-SIZE (upp-x11-src-5485.tar.gz) = 36693193
>+SHA256 (upp-x11-src-8227.tar.gz) = 0cbac66dd527d9b05fc279ffb8b53cab1cd67d275f173c95a59b904fd46bb338
>+SIZE (upp-x11-src-8227.tar.gz) = 44496813
>diff -ruN upp.orig/files/patch-bazaar.diff upp/files/patch-bazaar.diff
>--- upp.orig/files/patch-bazaar.diff	1970-01-01 03:00:00.000000000 +0300
>+++ upp/files/patch-bazaar.diff	2015-03-15 01:56:28.000000000 +0400
>@@ -0,0 +1,36 @@
>+diff -ruN bazaar.orig/FreeType/FreeType.upp bazaar/FreeType/FreeType.upp
>+--- bazaar.orig/FreeType/FreeType.upp	2015-03-02 04:01:02.000000000 +0400
>++++ bazaar/FreeType/FreeType.upp	2015-03-15 01:45:31.000000000 +0400
>+@@ -1,4 +1,4 @@
>+-options(GCC) "-include \"UppFreetype.h\"";
>++options(POSIX) "-include \"UppFreetype.h\"";
>+ 
>+ options(MSC) "-FI \"UppFreetype.h\"";
>+ 
>+diff -ruN bazaar.orig/Media/Media.upp bazaar/Media/Media.upp
>+--- bazaar.orig/Media/Media.upp	2015-03-02 04:01:01.000000000 +0400
>++++ bazaar/Media/Media.upp	2015-03-15 01:47:22.000000000 +0400
>+@@ -8,7 +8,7 @@
>+ 
>+ library(GCC WIN32) "avcodec avformat avutil swscale avdevice avcore";
>+ 
>+-library(GCC !WIN32) "avutil avcodec avformat avdevice swscale";
>++library(POSIX) "avutil avcodec avformat avdevice swscale";
>+ 
>+ link(MSC) /FORCE:MULTIPLE;
>+ 
>+diff -ruN bazaar.orig/Tcc/Tcc.upp bazaar/Tcc/Tcc.upp
>+--- bazaar.orig/Tcc/Tcc.upp	2015-03-02 04:01:02.000000000 +0400
>++++ bazaar/Tcc/Tcc.upp	2015-03-15 01:48:36.000000000 +0400
>+@@ -3,9 +3,9 @@
>+ uses
>+ 	Core;
>+ 
>+-uses(GCC) plugin/tcc;
>++uses(POSIX) plugin/tcc;
>+ 
>+-options(GCC) -DLIBTCC;
>++options(POSIX) -DLIBTCC;
>+ 
>+ options(WIN32) "-DTCC_TARGET_PE -DLIBTCC";
>+ 
>diff -ruN upp.orig/files/patch-uppsrc_Core_Defs.h upp/files/patch-uppsrc_Core_Defs.h
>--- upp.orig/files/patch-uppsrc_Core_Defs.h	1970-01-01 03:00:00.000000000 +0300
>+++ upp/files/patch-uppsrc_Core_Defs.h	2015-03-08 03:23:55.000000000 +0400
>@@ -0,0 +1,12 @@
>+# Allow to build with using modern GCC
>+--- uppsrc/Core/Defs.h.orig	2015-01-27 01:00:02.000000000 +0400
>++++ uppsrc/Core/Defs.h	2015-03-06 21:55:01.000000000 +0400
>+@@ -337,7 +337,7 @@
>+ inline bool IsNaN(double d)        { return _isnan(d); }
>+ inline bool IsInf(double d)        { return !_finite(d) && !_isnan(d); }
>+ #endif
>+-#elif __APPLE__ || __DragonFly__
>++#elif __APPLE__ || __DragonFly__ || (PLATFORM_BSD && GCC_VERSION >= 40700)
>+ inline bool IsNaN(double d)        { return std::isnan(d); }
>+ inline bool IsInf(double d)        { return std::isinf(d); }
>+ #else
>diff -ruN upp.orig/files/patch-uppsrc_PostgreSQL_PostgreSQL.upp upp/files/patch-uppsrc_PostgreSQL_PostgreSQL.upp
>--- upp.orig/files/patch-uppsrc_PostgreSQL_PostgreSQL.upp	1970-01-01 03:00:00.000000000 +0300
>+++ upp/files/patch-uppsrc_PostgreSQL_PostgreSQL.upp	2015-03-15 02:02:39.000000000 +0400
>@@ -0,0 +1,11 @@
>+--- uppsrc/PostgreSQL/PostgreSQL.upp.orig	2015-03-02 04:01:00.000000000 +0400
>++++ uppsrc/PostgreSQL/PostgreSQL.upp	2015-03-15 02:01:15.000000000 +0400
>+@@ -9,7 +9,7 @@
>+ 
>+ library(WIN32 !NOPOSTGRESQL GCC) pq;
>+ 
>+-library(LINUX !NOPOSTGRESQL) pq;
>++library(POSIX !NOPOSTGRESQL) pq;
>+ 
>+ file
>+ 	PostgreSQL.h,
>diff -ruN upp.orig/files/patch-uppsrc_ide_SrcUpdater_Install.cpp.diff upp/files/patch-uppsrc_ide_SrcUpdater_Install.cpp.diff
>--- upp.orig/files/patch-uppsrc_ide_SrcUpdater_Install.cpp.diff	1970-01-01 03:00:00.000000000 +0300
>+++ upp/files/patch-uppsrc_ide_SrcUpdater_Install.cpp.diff	2015-03-10 01:08:58.000000000 +0400
>@@ -0,0 +1,17 @@
>+# Delete *.bm files for local install, not just GCC.bm
>+--- uppsrc/ide/SrcUpdater/Install.cpp.orig	2012-08-31 16:10:00.000000000 +0400
>++++ uppsrc/ide/SrcUpdater/Install.cpp	2015-03-10 01:05:26.000000000 +0400
>+@@ -282,7 +282,12 @@
>+ 			if(!CopyFolder(UpdaterCfg().localsrc,UpdaterCfg().globalsrc,&p)){
>+ 				Exclamation(DeQtf("Failed to copy "+UpdaterCfg().globalsrc+" to "+UpdaterCfg().localsrc));
>+ 			}
>+-			DeleteFile(AppendFileName(UpdaterCfg().localsrc,"GCC.bm"));
>++			FindFile ff(AppendFileName(UpdaterCfg().globalsrc, "*.bm"));
>++			while (ff) {
>++				if (ff.IsFile())
>++					FileDelete(AppendFileName(UpdaterCfg().localsrc, ff.GetName()));
>++				ff.Next();
>++			}
>+ 			break;
>+ 		}
>+ 		case 1:{

Actions: View | Diff

Attachments on bug 198359: 153909 | 153910 | 153913 | 153947 | 153984 | 153987 | 154119 | 154307 | 154308 | 155555