Attachment 219133 Details for Bug 250663 – scite-4.4.5.patch

[patch] scite-4.4.5.patch

scite-4.4.5.patch (text/plain), 4.78 KB, created by Naram Qashat on 2020-10-27 01:39:39 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Naram Qashat

Created: 2020-10-27 01:39:39 UTC

Size: 4.78 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 552763)
>+++ Makefile	(working copy)
>@@ -2,7 +2,7 @@
> # $FreeBSD$
> 
> PORTNAME=	scite
>-DISTVERSION=	4.3.2
>+DISTVERSION=	4.4.5
> CATEGORIES=	editors gnome
> MASTER_SITES=	SF/scintilla/SciTE/${PORTVERSION}
> DISTNAME=	${PORTNAME}${PORTVERSION:S/.//g}
>@@ -28,6 +28,9 @@
> USE_GNOME=	cairo gdkpixbuf2 gtk30
> MAKEFILE=	makefile
> MAKE_ARGS=	GTK3=1
>+.if defined(WITH_DEBUG)
>+MAKE_ARGS+=	DEBUG=1
>+.endif
> 
> PORTDATA=	*.properties
> PORTDOCS=	*.html *.jpg *.png
>@@ -39,12 +42,12 @@
> .endif
> 
> post-patch:
>-	@${REINPLACE_CMD} -e 's| -Os||g' ${WRKSRC}/makefile
> 	@${REINPLACE_CMD} -e 's|$$(SciteDefaultHome)|${DOCSDIR}|' \
> 		${WRKSRC}/../src/SciTEGlobal.properties
> 
> do-install:
> 	${INSTALL_PROGRAM} ${WRKSRC}/../bin/SciTE ${STAGEDIR}${PREFIX}/bin
>+	${LN} -sf SciTE ${STAGEDIR}${PREFIX}/bin/scite
> 	${INSTALL_MAN} ${WRKSRC}/../doc/scite.1 ${STAGEDIR}${MANPREFIX}/man/man1
> 	${INSTALL_DATA} ${WRKSRC}/SciTE.desktop ${STAGEDIR}${PREFIX}/share/applications
> 	${INSTALL_DATA} ${WRKSRC}/Sci48M.png ${STAGEDIR}${PREFIX}/share/pixmaps
>Index: distinfo
>===================================================================
>--- distinfo	(revision 552763)
>+++ distinfo	(working copy)
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1584222159
>-SHA256 (scite432.tgz) = fb7d9d2899b9559b31beca6a695d5b271cc7a6461b218e4a961b4fcd320a798f
>-SIZE (scite432.tgz) = 2710026
>+TIMESTAMP = 1601836826
>+SHA256 (scite445.tgz) = 9d74bde5e4ee18d767b6add5a6b95d7ffcedbcfd017c3df59e16b0785e3521a1
>+SIZE (scite445.tgz) = 2777899
>Index: files/patch-gtk_makefile
>===================================================================
>--- files/patch-gtk_makefile	(revision 552763)
>+++ files/patch-gtk_makefile	(working copy)
>@@ -1,32 +1,33 @@
>---- gtk/makefile.orig	2020-01-02 00:45:08 UTC
>+--- gtk/makefile.orig	2020-09-11 10:44:44 UTC
> +++ gtk/makefile
>-@@ -18,8 +18,6 @@ ifdef CLANG
>+@@ -18,9 +18,7 @@ ifdef CLANG
>  # thread also need to create Position Independent Executable -> search online documentation
>  SANITIZE = address
>  #SANITIZE = undefined
> -CXX = clang++
> -CC = clang
>- BASE_FLAGS += -fsanitize=$(SANITIZE)
>+-BASE_FLAGS += -fsanitize=$(SANITIZE)
>++#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)
>-@@ -141,8 +139,9 @@ SRC_OBJS = \
>- 	StyleWriter.o \
>+ else
>+@@ -59,7 +57,7 @@ COMPLIB=$(SCINTILLA_DIR)/bin/scintilla.a
>+ COMPONENT=$(srcdir)/../bin/libscintilla.$(SHAREDEXTENSION)
>+ LEXILLA=$(srcdir)/../bin/liblexilla.$(SHAREDEXTENSION)
>+ 
>+-all: $(PROG) $(COMPONENT) $(LEXILLA)
>++all: $(PROG)
>+ 
>+ vpath %.h $(srcdir) $(srcdir)/../src $(SCINTILLA_DIR)/include
>+ vpath %.cxx $(srcdir) $(srcdir)/../src
>+@@ -151,7 +149,9 @@ SRC_OBJS = \
>  	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)
>+ $(PROG): SciTEGTK.o GUIGTK.o Widget.o DirectorExtension.o $(SRC_OBJS) $(LUA_OBJS)
>+-	$(CXX) $(BASE_FLAGS) $(LDFLAGS) -rdynamic -Wl,--as-needed -Wl,-rpath,'$${ORIGIN}' -Wl,--version-script $(srcdir)/lua.vers -Wl,-rpath,$(libdir) $^ -o $@ $(CONFIGLIB) $(LIBS) -L ../../scintilla/bin -lscintilla $(LDLIBS)
>++	$(CXX) $(BASE_FLAGS) $(LDFLAGS) -rdynamic \
>++	-Wl,--version-script $(srcdir)/lua.vers $^ -o $@ -lscintilla \
>++	-Wl,--as-needed $(CONFIGLIB)
>  
>  # Automatically generate header dependencies with "make deps"
>  include deps.mak
>Index: pkg-descr
>===================================================================
>--- pkg-descr	(revision 552763)
>+++ pkg-descr	(working copy)
>@@ -4,4 +4,4 @@
> configurations - I use it for building test and demonstration programs as well
> as SciTE and Scintilla, themselves.
> 
>-WWW: http://www.scintilla.org/SciTE.html
>+WWW: https://www.scintilla.org/SciTE.html
>Index: pkg-plist
>===================================================================
>--- pkg-plist	(revision 552763)
>+++ pkg-plist	(working copy)
>@@ -1,4 +1,5 @@
> bin/SciTE
>+bin/scite
> man/man1/scite.1.gz
> share/applications/SciTE.desktop
> share/pixmaps/Sci48M.png

Flags:

cyberbotx: maintainer-approval+

Actions: View | Diff

Attachments on bug 250663: 219132 | 219133