Attachment 163748 Details for Bug 204961 – Proposed patch (since 385394 revision)

[patch] Proposed patch (since 385394 revision)

upp_8227-9251.diff (text/plain), 6.78 KB, created by lightside on 2015-12-02 11:16:06 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: lightside

Created: 2015-12-02 11:16:06 UTC

Size: 6.78 KB

patch

obsolete

>diff -ruN upp.orig/Makefile upp/Makefile
>--- upp.orig/Makefile	2015-05-04 15:17:21.000000000 +0400
>+++ upp/Makefile	2015-12-02 05:36:49.754197000 +0400
>@@ -2,9 +2,9 @@
> # $FreeBSD: head/devel/upp/Makefile 385394 2015-05-04 11:17:21Z jbeich $
> 
> PORTNAME=	upp
>-PORTVERSION=	8227
>+PORTVERSION=	9251
> CATEGORIES=	devel x11-toolkits
>-MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/2015.1/
>+MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/2015.2/
> DISTNAME=	${PORTNAME}-x11-src-${PORTVERSION}
> 
> MAINTAINER=	m.sund@arcor.de
>@@ -35,6 +35,12 @@
> 		-I${LOCALBASE}/include/pango-1.0 -I${LOCALBASE}/include/glib-2.0 \
> 		-I${LOCALBASE}/lib/glib-2.0/include -I/usr/include"
> 
>+MAKE_JOBS_UNSAFE=	yes
>+
>+BROKEN_ia64=	Does not compile on ${ARCH}
>+BROKEN_powerpc=	Does not compile on ${ARCH}
>+BROKEN_sparc64=	Does not compile on ${ARCH}
>+
> PORTDATA=	bazaar examples reference tutorial uppsrc *.bm
> 
> DESKTOP_ENTRIES="TheIDE" "IDE for cross-platform C++ development" \
>@@ -43,6 +49,7 @@
> 
> OPTIONS_DEFINE=	SDL OPENGL MYSQL PGSQL USEMALLOC
> USEMALLOC_DESC=	Compile without U++ heap allocator
>+USEMALLOC_VARS=	MACRO_FLAGS+=-DflagUSEMALLOC
> 
> PLIST_FILES=	bin/theide
> 
>@@ -51,16 +58,6 @@
> MYSQL_USE=	mysql=yes
> PGSQL_USES=	pgsql
> 
>-.include <bsd.port.options.mk>
>-
>-.if ${PORT_OPTIONS:MUSEMALLOC}
>-MACRO_FLAGS+=	-DflagUSEMALLOC
>-.endif
>-
>-.if ${ARCH} == "ia64" || ${ARCH} == "powerpc" || ${ARCH} == "sparc64"
>-BROKEN=		Does not compile on ia64, powerpc, or sparc64
>-.endif
>-
> post-patch: .SILENT
> 	${MV} ${BUILD_WRKSRC}/Makefile.in ${BUILD_WRKSRC}/Makefile
> 	${REINPLACE_CMD} -e '/^CXX =/d;/^CFLAGS =/d;/^CXXFLAGS =/d;/^LDFLAGS =/d' \
>@@ -70,6 +67,7 @@
> 
> post-build: .SILENT
> 	${ECHO_CMD} "BUILDER = \"GCC\"" > ${WRKSRC}/GCC.bm
>+	${ECHO_CMD} "COMMON_CPP_OPTIONS = \"-std=c++0x\";" >> ${WRKSRC}/GCC.bm
> 	${ECHO_CMD} "DEBUG_INFO = \"0\";" >> ${WRKSRC}/GCC.bm
> 	${ECHO_CMD} "DEBUG_BLITZ = \"1\";" >> ${WRKSRC}/GCC.bm
> 	${ECHO_CMD} "DEBUG_LINKMODE = \"1\";" >> ${WRKSRC}/GCC.bm
>@@ -91,6 +89,8 @@
> 	(cd ${WRKSRC} && ${CP} GCC.bm CLANG.bm && \
> 		${SED} -i '' -e '/^BUILDER/s|GCC|CLANG| ; \
> 		s| -fdata-sections|| ; s| -finline-limit=20||' CLANG.bm)
>+	${ECHO_CMD} "COMMON_OPTIONS = \"-Wno-logical-op-parentheses\";" >> ${WRKSRC}/CLANG.bm
>+	${ECHO_CMD} "ALLOW_PRECOMPILED_HEADERS = \"0\";" >> ${WRKSRC}/CLANG.bm
> 
> do-install:
> 	${INSTALL_PROGRAM} ${WRKSRC}/theide ${STAGEDIR}${PREFIX}/bin
>diff -ruN upp.orig/distinfo upp/distinfo
>--- upp.orig/distinfo	2015-05-04 15:17:21.000000000 +0400
>+++ upp/distinfo	2015-12-02 03:26:19.076749000 +0400
>@@ -1,2 +1,2 @@
>-SHA256 (upp-x11-src-8227.tar.gz) = 0cbac66dd527d9b05fc279ffb8b53cab1cd67d275f173c95a59b904fd46bb338
>-SIZE (upp-x11-src-8227.tar.gz) = 44496813
>+SHA256 (upp-x11-src-9251.tar.gz) = f1012e15914a4a9d4c70c008b94b932db7dd39ff043bdf5c4584a45f7580ebd5
>+SIZE (upp-x11-src-9251.tar.gz) = 45014025
>diff -ruN upp.orig/files/patch-bazaar_FreeType_FreeType.upp upp/files/patch-bazaar_FreeType_FreeType.upp
>--- upp.orig/files/patch-bazaar_FreeType_FreeType.upp	2015-05-04 15:17:21.000000000 +0400
>+++ upp/files/patch-bazaar_FreeType_FreeType.upp	1970-01-01 03:00:00.000000000 +0300
>@@ -1,8 +0,0 @@
>---- bazaar/FreeType/FreeType.upp.orig	2015-03-02 00:01:02 UTC
>-+++ bazaar/FreeType/FreeType.upp
>-@@ -1,4 +1,4 @@
>--options(GCC) "-include \"UppFreetype.h\"";
>-+options(CLANG | GCC) "-include \"UppFreetype.h\"";
>- 
>- options(MSC) "-FI \"UppFreetype.h\"";
>- 
>diff -ruN upp.orig/files/patch-bazaar_Media_Media.upp upp/files/patch-bazaar_Media_Media.upp
>--- upp.orig/files/patch-bazaar_Media_Media.upp	2015-05-04 15:17:21.000000000 +0400
>+++ upp/files/patch-bazaar_Media_Media.upp	1970-01-01 03:00:00.000000000 +0300
>@@ -1,11 +0,0 @@
>---- bazaar/Media/Media.upp.orig	2015-03-02 00:01:01 UTC
>-+++ bazaar/Media/Media.upp
>-@@ -8,7 +8,7 @@ library(MSC) "avcodec.lib avformat.lib a
>- 
>- 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 upp.orig/files/patch-bazaar_Tcc_Tcc.upp upp/files/patch-bazaar_Tcc_Tcc.upp
>--- upp.orig/files/patch-bazaar_Tcc_Tcc.upp	2015-05-04 15:17:21.000000000 +0400
>+++ upp/files/patch-bazaar_Tcc_Tcc.upp	1970-01-01 03:00:00.000000000 +0300
>@@ -1,14 +0,0 @@
>---- bazaar/Tcc/Tcc.upp.orig	2015-03-02 00:01:02 UTC
>-+++ bazaar/Tcc/Tcc.upp
>-@@ -3,9 +3,9 @@ description "Tiny C Compiler wrapper\377
>- uses
>- 	Core;
>- 
>--uses(GCC) plugin/tcc;
>-+uses(CLANG | GCC) 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	2015-05-04 15:17:21.000000000 +0400
>+++ upp/files/patch-uppsrc_Core_Defs.h	1970-01-01 03:00:00.000000000 +0300
>@@ -1,11 +0,0 @@
>---- uppsrc/Core/Defs.h.orig	2015-01-26 21:00:02 UTC
>-+++ uppsrc/Core/Defs.h
>-@@ -337,7 +337,7 @@ inline bool IsInf(double d)        { ret
>- 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	2015-05-04 15:17:21.000000000 +0400
>+++ upp/files/patch-uppsrc_PostgreSQL_PostgreSQL.upp	1970-01-01 03:00:00.000000000 +0300
>@@ -1,11 +0,0 @@
>---- uppsrc/PostgreSQL/PostgreSQL.upp.orig	2015-03-02 00:01:00 UTC
>-+++ uppsrc/PostgreSQL/PostgreSQL.upp
>-@@ -9,7 +9,7 @@ library(WIN32 !NOPOSTGRESQL MSC) libpq;
>- 
>- 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 upp/files/patch-uppsrc_ide_SrcUpdater_Install.cpp
>--- upp.orig/files/patch-uppsrc_ide_SrcUpdater_Install.cpp	2015-05-04 15:17:21.000000000 +0400
>+++ upp/files/patch-uppsrc_ide_SrcUpdater_Install.cpp	1970-01-01 03:00:00.000000000 +0300
>@@ -1,16 +0,0 @@
>---- uppsrc/ide/SrcUpdater/Install.cpp.orig	2012-08-31 12:10:00 UTC
>-+++ uppsrc/ide/SrcUpdater/Install.cpp
>-@@ -282,7 +282,12 @@ void InstallWizard::Perform(){
>- 			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:{

Flags:

koobs: maintainer-approval? (m.sund)

Actions: View | Diff

Attachments on bug 204961: 163748 | 163749