From owner-svn-ports-head@freebsd.org Thu Oct 29 20:05:38 2020 Return-Path: Delivered-To: svn-ports-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id DF47845C6E7; Thu, 29 Oct 2020 20:05:38 +0000 (UTC) (envelope-from lwhsu@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4CMbz65XVtz4HZD; Thu, 29 Oct 2020 20:05:38 +0000 (UTC) (envelope-from lwhsu@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id A105EB392; Thu, 29 Oct 2020 20:05:38 +0000 (UTC) (envelope-from lwhsu@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 09TK5c7U096611; Thu, 29 Oct 2020 20:05:38 GMT (envelope-from lwhsu@FreeBSD.org) Received: (from lwhsu@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 09TK5bPl096607; Thu, 29 Oct 2020 20:05:37 GMT (envelope-from lwhsu@FreeBSD.org) Message-Id: <202010292005.09TK5bPl096607@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: lwhsu set sender to lwhsu@FreeBSD.org using -f From: Li-Wen Hsu Date: Thu, 29 Oct 2020 20:05:37 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r553638 - head/x11-toolkits/scintilla X-SVN-Group: ports-head X-SVN-Commit-Author: lwhsu X-SVN-Commit-Paths: head/x11-toolkits/scintilla X-SVN-Commit-Revision: 553638 X-SVN-Commit-Repository: ports 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.33 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, 29 Oct 2020 20:05:38 -0000 Author: lwhsu Date: Thu Oct 29 20:05:37 2020 New Revision: 553638 URL: https://svnweb.freebsd.org/changeset/ports/553638 Log: x11-toolkits/scintilla: Update to 4.4.5 * Update Makefile (add PATCH_WRKSRC because I needed to patch some files outside of WRKSRC, add some GNOME Uses that poudriere complained about, remove the pseudo-versioning because it was never being done in the actual compilation anyways, add a way to get a debug build) * Update distinfo * Correct URL in pkg-descr * Remove patch-makefile (due to the PATCH_WRKSRC change) * Add patch-gtk_makefile (due to the PATCH_WRKSRC change) and patch-lexilla_src_makefile * Add patch-src_PositionCache.h, patch-src_Style.cxx and patch-src_Style.h, temporary patches for this version until 4.4.6 comes out to fix compilation with newer compilers * Update pkg-plist Use of ASAN is removed from the build as it was causing an ASAN error for me when trying to run SciTE within a VM due to libGL (which isn't compiled with ASAN, nor is the FreeBSD base system libraries), and the author of Scintilla and SciTE said that it was fine to remove (his thought being that normally Scintilla and SciTE aren't built with Clang, but since it is the default compiler for FreeBSD and I want the software to work, it is better to just not enable ASAN until it is enabled everywhere. The removal of the version number on the libraries was due to consensus on IRC in #bsdports that it wasn't necessary if the software was not originally doing so in the first place. Changelog: https://www.scintilla.org/ScintillaHistory.html PR: 250663 Submitted by: Naram Qashat (maintainer) MFH: 2020Q4 Modified: head/x11-toolkits/scintilla/Makefile head/x11-toolkits/scintilla/distinfo head/x11-toolkits/scintilla/pkg-descr head/x11-toolkits/scintilla/pkg-plist Modified: head/x11-toolkits/scintilla/Makefile ============================================================================== --- head/x11-toolkits/scintilla/Makefile Thu Oct 29 20:04:37 2020 (r553637) +++ head/x11-toolkits/scintilla/Makefile Thu Oct 29 20:05:37 2020 (r553638) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= scintilla -DISTVERSION= 4.3.2 +DISTVERSION= 4.4.5 CATEGORIES= x11-toolkits MASTER_SITES= SF/scintilla/SciTE/${PORTVERSION} DISTNAME= scite${PORTVERSION:S/.//g} @@ -17,18 +17,18 @@ LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-se USES= compiler:c++17-lang gmake gnome iconv pkgconfig tar:tgz +PATCH_WRKSRC= ${WRKDIR}/${PORTNAME} WRKSRC= ${WRKDIR}/${PORTNAME}/gtk MAKEFILE= makefile USE_LDCONFIG= yes -USE_GNOME= gtk30 +USE_GNOME= cairo gdkpixbuf2 gtk30 MAKE_ENV= LDFLAGS="${LDFLAGS}" CFLAGS+= -DPIC ${PICFLAG} -MAJOR= 3 -AGE= 0 -REVISION= 0 -MAKE_ARGS= MAJOR="${MAJOR}" AGE="${AGE}" REVISION="${REVISION}" GTK3=1 -PLIST_SUB= MAJOR="${MAJOR}" AGE="${AGE}" REVISION="${REVISION}" +MAKE_ARGS= GTK3=1 +.if defined(WITH_DEBUG) +MAKE_ARGS+= DEBUG=1 +.endif .include @@ -42,18 +42,10 @@ PICFLAG?= -fPIC PICFLAG?= -fpic .endif -post-patch: - @${REINPLACE_CMD} -e 's| -Os||g' ${WRKSRC}/makefile - do-install: @${MKDIR} ${STAGEDIR}${PREFIX}/include/scintilla - ${INSTALL_DATA} ${WRKSRC}/../include/*.h ${STAGEDIR}${PREFIX}/include/scintilla -.for f in libscintilla.so libscintilla_lexers.so - ${INSTALL_LIB} ${WRKSRC}/${f}.${MAJOR}.${AGE}.${REVISION} \ - ${STAGEDIR}${PREFIX}/lib - (cd ${STAGEDIR}${PREFIX}/lib && \ - ${LN} -sf ${f}.${MAJOR}.${AGE}.${REVISION} ${f}.${MAJOR} && \ - ${LN} -sf ${f}.${MAJOR} ${f}) -.endfor + ${INSTALL_DATA} ${WRKSRC}/../include/*.h \ + ${STAGEDIR}${PREFIX}/include/scintilla + ${INSTALL_LIB} ${WRKSRC}/../bin/*.so ${STAGEDIR}${PREFIX}/lib .include Modified: head/x11-toolkits/scintilla/distinfo ============================================================================== --- head/x11-toolkits/scintilla/distinfo Thu Oct 29 20:04:37 2020 (r553637) +++ head/x11-toolkits/scintilla/distinfo Thu Oct 29 20:05:37 2020 (r553638) @@ -1,3 +1,3 @@ -TIMESTAMP = 1584222036 -SHA256 (scite432.tgz) = fb7d9d2899b9559b31beca6a695d5b271cc7a6461b218e4a961b4fcd320a798f -SIZE (scite432.tgz) = 2710026 +TIMESTAMP = 1601836808 +SHA256 (scite445.tgz) = 9d74bde5e4ee18d767b6add5a6b95d7ffcedbcfd017c3df59e16b0785e3521a1 +SIZE (scite445.tgz) = 2777899 Modified: head/x11-toolkits/scintilla/pkg-descr ============================================================================== --- head/x11-toolkits/scintilla/pkg-descr Thu Oct 29 20:04:37 2020 (r553637) +++ head/x11-toolkits/scintilla/pkg-descr Thu Oct 29 20:05:37 2020 (r553638) @@ -8,4 +8,4 @@ use of proportional fonts, bold and italics, multiple colours and multiple fonts. It comes with complete source code and may be used in any free project or commercial product. -WWW: http://www.scintilla.org/ +WWW: https://www.scintilla.org/ Modified: head/x11-toolkits/scintilla/pkg-plist ============================================================================== --- head/x11-toolkits/scintilla/pkg-plist Thu Oct 29 20:04:37 2020 (r553637) +++ head/x11-toolkits/scintilla/pkg-plist Thu Oct 29 20:05:37 2020 (r553638) @@ -5,9 +5,5 @@ include/scintilla/Sci_Position.h include/scintilla/SciLexer.h include/scintilla/Scintilla.h include/scintilla/ScintillaWidget.h +lib/liblexilla.so lib/libscintilla.so -lib/libscintilla.so.%%MAJOR%% -lib/libscintilla.so.%%MAJOR%%.%%AGE%%.%%REVISION%% -lib/libscintilla_lexers.so -lib/libscintilla_lexers.so.%%MAJOR%% -lib/libscintilla_lexers.so.%%MAJOR%%.%%AGE%%.%%REVISION%%