Attachment 211095 Details for Bug 243644 – scite-4.3.0.patch

[patch] scite-4.3.0.patch

scite-4.3.0.patch (text/plain), 4.40 KB, created by Naram Qashat on 2020-01-27 04:27:05 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Naram Qashat

Created: 2020-01-27 04:27:05 UTC

Size: 4.40 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 523727)
>+++ Makefile	(working copy)
>@@ -2,7 +2,7 @@
> # $FreeBSD$
> 
> PORTNAME=	scite
>-DISTVERSION=	4.2.3
>+DISTVERSION=	4.3.0
> CATEGORIES=	editors gnome
> MASTER_SITES=	SF/scintilla/SciTE/${PORTVERSION}
> DISTNAME=	${PORTNAME}${PORTVERSION:S/.//g}
>@@ -25,12 +25,19 @@
> PATCH_WRKSRC=	${WRKDIR}/${PORTNAME}
> WRKSRC=		${WRKDIR}/${PORTNAME}/gtk
> 
>-USE_GNOME=	cairo gdkpixbuf2 gtk20
>+USE_GNOME=	cairo gdkpixbuf2 gtk30
> MAKEFILE=	makefile
>+MAKE_ARGS=	GTK3=1
> 
> PORTDATA=	*.properties
> PORTDOCS=	*.html *.jpg *.png
> 
>+.include <bsd.port.pre.mk>
>+
>+.if ${CHOSEN_COMPILER_TYPE} == clang
>+MAKE_ARGS+=	CLANG=1
>+.endif
>+
> post-patch:
> 	@${REINPLACE_CMD} -e 's| -Os||g' ${WRKSRC}/makefile
> 	@${REINPLACE_CMD} -e 's|$$(SciteDefaultHome)|${DOCSDIR}|' \
>@@ -44,4 +51,4 @@
> 	(cd ${WRKSRC}/../src && ${COPYTREE_SHARE} "${PORTDATA}" ${STAGEDIR}${DATADIR})
> 	(cd ${WRKSRC}/../doc && ${COPYTREE_SHARE} "${PORTDOCS}" ${STAGEDIR}${DOCSDIR})
> 
>-.include <bsd.port.mk>
>+.include <bsd.port.post.mk>
>Index: distinfo
>===================================================================
>--- distinfo	(revision 523727)
>+++ distinfo	(working copy)
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1578437945
>-SHA256 (scite423.tgz) = 7bd651008afe7fb7e2d0cbd28fd8f75803c64b5558f56aa68b035b3f994900b6
>-SIZE (scite423.tgz) = 2644248
>+TIMESTAMP = 1579657322
>+SHA256 (scite430.tgz) = 6401a2c25f8c2a1e0c06279e2f022722374a6aaf37d0b0acebce1a103fafe589
>+SIZE (scite430.tgz) = 2705289
>Index: files/patch-gtk_makefile
>===================================================================
>--- files/patch-gtk_makefile	(revision 523727)
>+++ files/patch-gtk_makefile	(working copy)
>@@ -1,33 +1,31 @@
>---- gtk/makefile.orig	2019-06-07 22:35:09 UTC
>+--- gtk/makefile.orig	2020-01-02 00:45:08 UTC
> +++ gtk/makefile
>-@@ -12,8 +12,8 @@ ifdef CLANG
>+@@ -18,8 +18,6 @@ ifdef CLANG
>  # thread also need to create Position Independent Executable -> search online documentation
>  SANITIZE = address
>  #SANITIZE = undefined
>--CXX = clang++ -fsanitize=$(SANITIZE) -Wno-deprecated-register
>--CC = clang -fsanitize=$(SANITIZE)
>-+CXX = $(CXX) -fsanitize=$(SANITIZE) -Wno-deprecated-register
>-+CC = $(CC) -fsanitize=$(SANITIZE)
>- CCWARNINGS = -Wno-empty-body -Wno-string-plus-int
>- else
>- MISLEADING=-Wno-misleading-indentation
>-@@ -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:=
>--gnomeprefix:=$(shell pkg-config --variable=prefix $(GTKVERSION) 2>/dev/null)
>+-CXX = clang++
>+-CC = clang
>+ BASE_FLAGS += -fsanitize=$(SANITIZE)
>+ WARNINGS += -Wno-deprecated-register
>+ WARNINGS += -Wno-empty-body
>+@@ -33,7 +31,7 @@ GTK_VERSION = $(if $(GTK3),gtk+-3.0,gtk+-2.0)
>+ # For the Gnome desktop stuff to work, prefix must point to where Gnome thinks it is.
>+ CONFIGFLAGS:=$(shell pkg-config --cflags $(GTK_VERSION))
>+ CONFIGLIB:=$(shell pkg-config --libs $(GTK_VERSION) gthread-2.0 gmodule-no-export-2.0)
>+-gnomeprefix:=$(shell pkg-config --variable=prefix $(GTK_VERSION) 2>/dev/null)
> +gnomeprefix:=$(PREFIX)
>  ifndef prefix
>  ifdef gnomeprefix
>    prefix=$(gnomeprefix)
>-@@ -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 \
>--	JobQueue.o GTKMutex.o IFaceTable.o $(COMPLIB) $(LUA_OBJS)
>--	$(CXX) `$(CONFIGTHREADS)` -rdynamic -Wl,--as-needed -Wl,--version-script $(srcdir)/lua.vers -DGTK $^ -o $@ $(CONFIGLIB) $(LIBDL) $(LDLIBS) -lm -lstdc++
>-+	JobQueue.o GTKMutex.o IFaceTable.o $(LUA_OBJS)
>-+	$(CXX) -rdynamic -Wl,--version-script $(srcdir)/lua.vers -DGTK $(CXXFLAGS) $^ -o $@ \
>+@@ -141,8 +139,9 @@ SRC_OBJS = \
>+ 	StyleWriter.o \
>+ 	Utf8_16.o
>+ 
>+-$(PROG): SciTEGTK.o GUIGTK.o Widget.o GTKMutex.o DirectorExtension.o $(SRC_OBJS) $(COMPLIB) $(LUA_OBJS)
>+-	$(CXX) $(BASE_FLAGS) -rdynamic -Wl,--as-needed -Wl,--version-script $(srcdir)/lua.vers $^ -o $@ $(CONFIGLIB) $(LIBS) $(LDLIBS)
>++$(PROG): SciTEGTK.o GUIGTK.o Widget.o GTKMutex.o DirectorExtension.o $(SRC_OBJS) $(LUA_OBJS)
>++	$(CXX) $(BASE_FLAGS) -rdynamic -Wl,--version-script $(srcdir)/lua.vers $(CXXFLAGS) $^ -o $@ \
> +	$(LDFLAGS) -lscintilla -lscintilla_lexers -Wl,--as-needed $(CONFIGLIB)
>  
>  # Automatically generate header dependencies with "make deps"

Flags:

cyberbotx: maintainer-approval+

Actions: View | Diff

Attachments on bug 243644: 211094 | 211095