Attachment 214621 Details for Bug 246563 – Proposed patch (since 517008 revision)

[patch] Proposed patch (since 517008 revision)

upp.diff (text/plain), 9.85 KB, created by lightside on 2020-05-19 06:43:19 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: lightside

Created: 2020-05-19 06:43:19 UTC

Size: 9.85 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 517008)
>+++ Makefile	(working copy)
>@@ -2,39 +2,31 @@
> # $FreeBSD$
> 
> PORTNAME=	upp
>-DISTVERSION=	11873
>-PORTREVISION=	3
>+DISTVERSION=	14429
> CATEGORIES=	devel x11-toolkits
>-MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/2018.1/
>-DISTNAME=	${PORTNAME}-x11-src-${PORTVERSION}
>+MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/2020.1/
>+DISTNAME=	${PORTNAME}-posix-${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
>+LICENSE_FILE=	${WRKSRC}/uppsrc/Core/Copying
> 
> BROKEN_powerpc=		Does not compile on ${ARCH}: error Unknown CPU architecture
> BROKEN_powerpc64=	Does not compile on ${ARCH}: error Unknown CPU architecture
> BROKEN_sparc64=		Does not compile on ${ARCH}
> 
>-USES=		compiler:c++11-lib
>+USES=		compiler:c++14-lang pkgconfig:both tar:xz
> 
>-WRKSRC=		${WRKDIR}/${DISTNAME}
>-BUILD_WRKSRC=	${WRKSRC}/uppsrc
>+WRKSRC=		${WRKDIR}/${PORTNAME}
> 
> MACRO_FLAGS=	-DflagBSD -Dflag${OPSYS:tu}
>-CINC_GUI=	-I. -I${LOCALBASE}/include -I${LOCALBASE}/include/freetype2 \
>-		-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/usr/include
>-CINC_CONSOLE=	-I. -I${LOCALBASE}/include -I/usr/include
> 
>-PORTDATA=	bazaar examples reference tutorial uppsrc *.bm
>+PORTDATA=	bazaar examples reference tutorial uppsrc
> 
>-OPTIONS_DEFINE=	MYSQL OPENGL PGSQL SCD SDL USEMALLOC
>-OPTIONS_DEFAULT=	IDE SCD UMK
>+OPTIONS_DEFINE=	MYSQL OPENGL PGSQL SDL UDC USEMALLOC
>+OPTIONS_DEFAULT=	IDE UDC UMK
> OPTIONS_MULTI=	BUILD
> OPTIONS_MULTI_BUILD=	IDE UMK
> BUILD_DESC=	Build/install
>@@ -42,21 +34,19 @@
> IDE_DESKTOP_ENTRIES=	"TheIDE" "IDE for cross-platform C++ development" \
> 		"${DATADIR}/uppsrc/ide/theide-48.png" "theide" \
> 		"Development;IDE;GTK;" false
>-IDE_LIB_DEPENDS=	libexpat.so:textproc/expat2 \
>-		libfreetype.so:print/freetype2 \
>+IDE_LIB_DEPENDS=	libfreetype.so:print/freetype2 \
> 		libfontconfig.so:x11-fonts/fontconfig \
> 		libnotify.so:devel/libnotify \
> 		libpng.so:graphics/png
> IDE_PLIST_FILES=	bin/theide ${MANPREFIX}/man/man1/theide.1.gz
> IDE_USES=	gnome xorg
>-IDE_USE=	XORG=x11,xau,xcb,xcursor,xdmcp,xext,xfixes,xft,xi,xinerama,xrandr,xrender \
>-		GNOME=cairo,gdkpixbuf2,gtk20
>+IDE_USE=	XORG=x11 GNOME=cairo,gdkpixbuf2,gtk30
>+UDC_DESC=	Install spelling dictionaries (*.udc files)
>+UDC_VARS=	PORTDATA+=*.udc
> UMK_DESC=	Build/install UMK (U++ MaKe command line utility)
> UMK_PLIST_FILES=	bin/umk ${MANPREFIX}/man/man1/umk.1.gz
> USEMALLOC_DESC=	Compile without U++ heap allocator
> USEMALLOC_VARS=	MACRO_FLAGS+=-DflagUSEMALLOC
>-SCD_DESC=	Install spelling dictionaries (*.scd files)
>-SCD_VARS=	PORTDATA+=*.scd
> # SDL/OPENGL/MYSQL/PGSQL dependencies are only for run-time for use by executables built by the IDE
> SDL_USES=	sdl
> SDL_USE=	SDL=sdl
>@@ -76,69 +66,44 @@
> CXXFLAGS_i386+=	-msse2
> 
> post-patch: .SILENT
>-	${CP} ${BUILD_WRKSRC}/Makefile.in ${BUILD_WRKSRC}/Makefile
>-	${CP} ${BUILD_WRKSRC}/uMakefile.in ${BUILD_WRKSRC}/uMakefile
>-	${REINPLACE_CMD} -i '' -e '/^CXX[[:blank:]]*=/d; /^CFLAGS[[:blank:]]*=/d; \
>-		/^LDFLAGS[[:blank:]]*=/d ; \
>+	${REINPLACE_CMD} -e '/^CXX[[:blank:]]*=/d ; \
>+		/^LDFLAGS[[:blank:]]*=/d ; /^LIBPATH[[:blank:]]*=/d ; \
> 		/^Macro[[:blank:]]*=/s|-DflagLINUX|${MACRO_FLAGS}| ; \
>-		s|$^CXXFLAGS$[[:blank:]]*=.*$-std=.*$|\1 += \2| ; \
>-		s|$^LIBPATH$[[:blank:]]*=.*|\1 = -L${LOCALBASE}/lib -L/usr/lib|' \
>-		${BUILD_WRKSRC}/Makefile \
>-		${BUILD_WRKSRC}/uMakefile
>-	${REINPLACE_CMD} -i '' -e 's|$^CINC$[[:blank:]]*=.*|\1 = ${CINC_GUI}| ; \
>-		/^OutDir_/s|-Gui-Linux|| ; \
>-		s|-ldl|-lXau -lXdmcp -lxcb -lexecinfo|' \
>-		${BUILD_WRKSRC}/Makefile
>-	${REINPLACE_CMD} -i '' -e 's|$^CINC$[[:blank:]]*=.*|\1 = ${CINC_CONSOLE}| ; \
>+		/^CFLAGS[[:blank:]]*=/s|= -O3|+=| ; \
>+		/^CXXFLAGS[[:blank:]]*=/s|= -O3|+=| ; \
> 		/^OutDir_/s|-Linux|| ; \
> 		s|-ldl|-lexecinfo|' \
>-		${BUILD_WRKSRC}/uMakefile
>+		${WRKSRC}/Makefile \
>+		${WRKSRC}/uMakefile
>+	${REINPLACE_CMD} -i '' -E '/^OutDir_/s|-Gui|| ; \
>+		s/[[:blank:]]?`pkg-config --(cflags|libs) (freetype2|xcb|expat|xinerama|xrender|xft|xdmcp|xext)`//g' \
>+		${WRKSRC}/Makefile
>+# Add ${DATADIR} as an additional path to search for *.upp files
>+# on first TheIDE launch before automatic configuration of assemblies
>+	${REINPLACE_CMD} -e '/Scan(GetHomeDirFile("\*"/s|$$|\${.newline}		Scan("${DATADIR}/uppsrc");\${.newline}		Scan("${DATADIR}/*");|' \
>+		${WRKSRC}/uppsrc/ide/Install.cpp
> 
>-do-build: .SILENT
>-	${ECHO_CMD} "BUILDER = \"GCC\"" > ${WRKSRC}/GCC.bm
>-	${ECHO_CMD} "COMMON_CPP_OPTIONS = \"-std=c++11\";" >> ${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
>-	${ECHO_CMD} "DEBUG_OPTIONS = \"-O0\";" >> ${WRKSRC}/GCC.bm
>-	${ECHO_CMD} "DEBUG_FLAGS = \"\";" >> ${WRKSRC}/GCC.bm
>-	${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 -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}/lib/glib-2.0/include;/usr/include\";" >> ${WRKSRC}/GCC.bm
>-	${ECHO_CMD} "LIB = \"${LOCALBASE}/lib;/usr/lib\";" >> ${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||' \
>-		CLANG.bm)
>-	${ECHO_CMD} "COMMON_OPTIONS = \"-Wno-logical-op-parentheses\";" >> ${WRKSRC}/CLANG.bm
>-	${ECHO_CMD} "ALLOW_PRECOMPILED_HEADERS = \"0\";" >> ${WRKSRC}/CLANG.bm
>+do-build:
> 
> do-build-IDE-on:
>-	@(cd ${BUILD_WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} \
>-		${MAKE_FLAGS} Makefile ${_MAKE_JOBS} UPPOUT="../_out/" OutFile="../theide")
>+	@(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} \
>+		${MAKE_FLAGS} Makefile ${_MAKE_JOBS} OutFile="theide")
> 
> do-build-UMK-on:
>-	@(cd ${BUILD_WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} \
>-		${MAKE_FLAGS} uMakefile ${_MAKE_JOBS} UPPOUT="../_out/" OutFile="../umk")
>+	@(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} \
>+		${MAKE_FLAGS} uMakefile ${_MAKE_JOBS} OutFile="umk")
> 
> do-install:
> 	(cd ${WRKSRC} && ${COPYTREE_SHARE} "${PORTDATA}" ${STAGEDIR}${DATADIR} \
> 		"-not ( -type d -empty ) -o -name '*.orig'")
>-	(cd ${STAGEDIR}${DATADIR}/uppsrc && ${RM} build_info.h *Makefile*)
>+	(cd ${STAGEDIR}${DATADIR} && ${RMDIR} uppsrc/ide/SrcUpdater uppsrc/Web)
> 
> do-install-IDE-on:
> 	${INSTALL_PROGRAM} ${WRKSRC}/theide ${STAGEDIR}${PREFIX}/bin
>-	${INSTALL_MAN} ${BUILD_WRKSRC}/ide/theide.1 ${STAGEDIR}${MANPREFIX}/man/man1
>+	${INSTALL_MAN} ${WRKSRC}/uppsrc/ide/theide.1 ${STAGEDIR}${MANPREFIX}/man/man1
> 
> do-install-UMK-on:
> 	${INSTALL_PROGRAM} ${WRKSRC}/umk ${STAGEDIR}${PREFIX}/bin
>-	${INSTALL_MAN} ${BUILD_WRKSRC}/umk/umk.1 ${STAGEDIR}${MANPREFIX}/man/man1
>+	${INSTALL_MAN} ${WRKSRC}/uppsrc/umk/umk.1 ${STAGEDIR}${MANPREFIX}/man/man1
> 
> .include <bsd.port.post.mk>
>Index: distinfo
>===================================================================
>--- distinfo	(revision 517008)
>+++ distinfo	(working copy)
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1522479324
>-SHA256 (upp-x11-src-11873.tar.gz) = 0231b768830db96257ebf7a9cc1aaff05017aa40a2ea6dfa577de7232c1cd07b
>-SIZE (upp-x11-src-11873.tar.gz) = 56167504
>+TIMESTAMP = 1588515745
>+SHA256 (upp-posix-14429.tar.xz) = 9f67329e64b85ef499463f7aef6afa88da8026a5a078b7a95b0129fa66fa5bf2
>+SIZE (upp-posix-14429.tar.xz) = 65677844
>Index: files/patch-uppsrc_plugin_sqlite3_lib_sqlite3.c
>===================================================================
>--- files/patch-uppsrc_plugin_sqlite3_lib_sqlite3.c	(revision 517008)
>+++ files/patch-uppsrc_plugin_sqlite3_lib_sqlite3.c	(nonexistent)
>@@ -1,36 +0,0 @@
>-# Fix for CVE-2018-8740: https://nvd.nist.gov/vuln/detail/CVE-2018-8740
>-# Detect databases whose schema is corrupted using a CREATE TABLE AS statement and issue an appropriate error message.
>-# Commit [d75e6765]: https://www.sqlite.org/src/info/d75e67654aa9620b
>-# Description: https://bugs.launchpad.net/ubuntu/+source/sqlite3/+bug/1756349
>-
>---- uppsrc/plugin/sqlite3/lib/sqlite3.c.orig	2018-03-31 06:10:16 UTC
>-+++ uppsrc/plugin/sqlite3/lib/sqlite3.c
>-@@ -103474,8 +103474,6 @@ SQLITE_PRIVATE void sqlite3EndTable(
>-   p = pParse->pNewTable;
>-   if( p==0 ) return;
>- 
>--  assert( !db->init.busy || !pSelect );
>--
>-   /* If the db->init.busy is 1 it means we are reading the SQL off the
>-   ** "sqlite_master" or "sqlite_temp_master" table on the disk.
>-   ** So do not write to the disk again.  Extract the root page number
>-@@ -103486,6 +103484,10 @@ SQLITE_PRIVATE void sqlite3EndTable(
>-   ** table itself.  So mark it read-only.
>-   */
>-   if( db->init.busy ){
>-+    if( pSelect ){
>-+      sqlite3ErrorMsg(pParse, "");
>-+      return;
>-+    }
>-     p->tnum = db->init.newTnum;
>-     if( p->tnum==1 ) p->tabFlags |= TF_Readonly;
>-   }
>-@@ -117813,7 +117815,7 @@ static void corruptSchema(
>-     char *z;
>-     if( zObj==0 ) zObj = "?";
>-     z = sqlite3MPrintf(db, "malformed database schema (%s)", zObj);
>--    if( zExtra ) z = sqlite3MPrintf(db, "%z - %s", z, zExtra);
>-+    if( zExtra && zExtra[0] ) z = sqlite3MPrintf(db, "%z - %s", z, zExtra);
>-     sqlite3DbFree(db, *pData->pzErrMsg);
>-     *pData->pzErrMsg = z;
>-   }

Flags:

lightside: maintainer-approval? (m.sund)

Actions: View | Diff

Attachments on bug 246563: 214621