Attachment 204995 Details for Bug 238505 – scite-4.1.6.patch

[patch] scite-4.1.6.patch

scite-4.1.6.patch (text/plain), 3.37 KB, created by Naram Qashat on 2019-06-11 19:39:19 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Naram Qashat

Created: 2019-06-11 19:39:19 UTC

Size: 3.37 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 503961)
>+++ Makefile	(working copy)
>@@ -2,7 +2,7 @@
> # $FreeBSD$
> 
> PORTNAME=	scite
>-DISTVERSION=	4.1.0
>+DISTVERSION=	4.1.6
> CATEGORIES=	editors gnome
> MASTER_SITES=	SF/scintilla/SciTE/${PORTVERSION}
> DISTNAME=	${PORTNAME}${PORTVERSION:S/.//g}
>@@ -18,7 +18,7 @@
> LIB_DEPENDS=	libscintilla.so:x11-toolkits/scintilla
> RUN_DEPENDS=	xdg-open:devel/xdg-utils
> 
>-USES=		compiler:c++17-lang desktop-file-utils gmake pkgconfig tar:tgz
>+USES=		compiler:c++17-lang desktop-file-utils gmake gnome pkgconfig tar:tgz
> 
> OPTIONS_DEFINE=	DOCS
> 
>Index: distinfo
>===================================================================
>--- distinfo	(revision 503961)
>+++ distinfo	(working copy)
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1529613535
>-SHA256 (scite410.tgz) = d1f9cf27b8d44b3d6bab179173a58cdfe76b44f84c8e74aeb85bf16c50148cf7
>-SIZE (scite410.tgz) = 2493701
>+TIMESTAMP = 1560266811
>+SHA256 (scite416.tgz) = de3bba3725304b44741c806e834b072e2a9f6cf84da7d12aed358040a3c4204c
>+SIZE (scite416.tgz) = 2624672
>Index: files/patch-gtk_makefile
>===================================================================
>--- files/patch-gtk_makefile	(revision 503961)
>+++ files/patch-gtk_makefile	(working copy)
>@@ -1,4 +1,4 @@
>---- gtk/makefile.orig	2018-05-06 22:32:10 UTC
>+--- gtk/makefile.orig	2019-06-07 22:35:09 UTC
> +++ gtk/makefile
> @@ -12,8 +12,8 @@ ifdef CLANG
>  # thread also need to create Position Independent Executable -> search online documentation
>@@ -5,13 +5,13 @@
>  SANITIZE = address
>  #SANITIZE = undefined
> -CXX = clang++ -fsanitize=$(SANITIZE) -Wno-deprecated-register
>--CC = clang -fsanitize=$(SANITIZE) -Wno-empty-body
>+-CC = clang -fsanitize=$(SANITIZE)
> +CXX = $(CXX) -fsanitize=$(SANITIZE) -Wno-deprecated-register
>-+CC = $(CC) -fsanitize=$(SANITIZE) -Wno-empty-body
>++CC = $(CC) -fsanitize=$(SANITIZE)
>+ CCWARNINGS = -Wno-empty-body -Wno-string-plus-int
>  else
>  MISLEADING=-Wno-misleading-indentation
>- endif
>-@@ -28,7 +28,7 @@ endif
>+@@ -29,7 +29,7 @@ endif
>  CONFIGFLAGS:=$(shell pkg-config --cflags $(GTKVERSION))
>  CONFIGLIB:=$(shell pkg-config --libs $(GTKVERSION) gthread-2.0 gmodule-no-export-2.0)
>  CONFIGTHREADS:=
>@@ -20,7 +20,7 @@
>  ifndef prefix
>  ifdef gnomeprefix
>    prefix=$(gnomeprefix)
>-@@ -122,8 +122,9 @@ FilePath.o EditorConfig.o SciTEBase.o Fi
>+@@ -125,8 +125,9 @@ FilePath.o EditorConfig.o SciTEBase.o FileWorker.o Coo
>  ExportHTML.o ExportPDF.o ExportRTF.o ExportTEX.o ExportXML.o \
>  MatchMarker.o StringHelpers.o \
>  PropSetFile.o MultiplexExtension.o DirectorExtension.o SciTEProps.o StyleDefinition.o StyleWriter.o Utf8_16.o \
>Index: files/patch-src_EditorConfig.cxx
>===================================================================
>--- files/patch-src_EditorConfig.cxx	(revision 503961)
>+++ files/patch-src_EditorConfig.cxx	(nonexistent)
>@@ -1,10 +0,0 @@
>---- src/EditorConfig.cxx.orig	2018-05-06 22:32:10 UTC
>-+++ src/EditorConfig.cxx
>-@@ -13,6 +13,7 @@
>- #include <map>
>- #include <algorithm>
>- #include <memory>
>-+#include <sys/time.h>
>- 
>- #include "Scintilla.h"
>- 
>
>Property changes on: files/patch-src_EditorConfig.cxx
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property

Flags:

cyberbotx: maintainer-approval+

Actions: View | Diff

Attachments on bug 238505: 204994 | 204995 | 205092 | 205093 | 205639 | 205640