Attachment 126801 Details for Bug 170565 – scite-3.2.1.patch

[patch] scite-3.2.1.patch

scite-3.2.1.patch (text/plain), 3.34 KB, created by Naram Qashat on 2012-08-12 20:00:05 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Naram Qashat

Created: 2012-08-12 20:00:05 UTC

Size: 3.34 KB

patch

obsolete

>diff -ruN --exclude=CVS /usr/ports/editors/scite/Makefile ./Makefile
>--- /usr/ports/editors/scite/Makefile	2012-08-05 13:42:33.000000000 -0400
>+++ ./Makefile	2012-08-12 14:53:08.000000000 -0400
>@@ -6,8 +6,7 @@
> #
> 
> PORTNAME=	scite
>-PORTVERSION=	3.1.0
>-PORTREVISION=	1
>+PORTVERSION=	3.2.1
> CATEGORIES=	editors gnome
> MASTER_SITES=	SF/scintilla/SciTE/${PORTVERSION}
> DISTNAME=	${PORTNAME}${PORTVERSION:S/.//g}
>diff -ruN --exclude=CVS /usr/ports/editors/scite/distinfo ./distinfo
>--- /usr/ports/editors/scite/distinfo	2012-04-25 23:30:25.000000000 -0400
>+++ ./distinfo	2012-08-12 14:41:49.000000000 -0400
>@@ -1,2 +1,2 @@
>-SHA256 (scite310.tgz) = 09b020a331f7c54edd731440fa1c717776021d5dc775e58965f8ef71673202e3
>-SIZE (scite310.tgz) = 1933322
>+SHA256 (scite321.tgz) = f95c89074fd73a22b783b5582d3b23cdbd4b7eb38ab407721a702c4a1bcb678c
>+SIZE (scite321.tgz) = 2043490
>diff -ruN --exclude=CVS /usr/ports/editors/scite/files/patch-aa ./files/patch-aa
>--- /usr/ports/editors/scite/files/patch-aa	2011-10-01 11:54:19.000000000 -0400
>+++ ./files/patch-aa	2012-08-12 14:48:05.000000000 -0400
>@@ -1,12 +1,15 @@
>---- makefile.orig	2011-07-31 22:49:29.000000000 -0400
>-+++ makefile	2011-09-27 05:23:10.000000000 -0400
>-@@ -5,13 +5,6 @@
>+--- makefile.orig	2012-06-01 04:26:56.000000000 -0400
>++++ makefile	2012-08-12 14:47:57.000000000 -0400
>+@@ -5,16 +5,6 @@
>  # GNU make does not like \r\n line endings so should be saved to CVS in binary form.
>  
>  .SUFFIXES: .cxx .o .h .a .c
> -ifdef CLANG
>--CC = clang
>--CCOMP = clang
>+-ifdef CLANG_ANALYZE
>+-ANALYZE=--analyze
>+-endif
>+-CC = clang $(ANALYZE)
>+-CCOMP = clang $(ANALYZE)
> -else
> -CC = g++
> -CCOMP = gcc
>@@ -14,18 +17,18 @@
>  AR = ar
>  
>  ifdef GTK3
>-@@ -24,7 +17,7 @@
>+@@ -27,7 +17,7 @@
>  CONFIGFLAGS:=$(shell pkg-config --cflags $(GTKVERSION))
>- CONFIGLIB:=$(shell pkg-config --libs $(GTKVERSION) gthread-2.0)
>+ 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)
> +gnomeprefix:=$(PREFIX)
>  ifndef prefix
>  ifdef gnomeprefix
>    prefix=$(gnomeprefix)
>-@@ -102,8 +95,9 @@
>+@@ -107,8 +97,9 @@
>  $(PROG): SciTEGTK.o GUIGTK.o Widget.o \
>- FilePath.o SciTEBase.o Credits.o SciTEBuffers.o SciTEIO.o StringList.o Exporters.o StringHelpers.o \
>+ FilePath.o SciTEBase.o FileWorker.o Cookie.o Credits.o SciTEBuffers.o SciTEIO.o StringList.o Exporters.o StringHelpers.o \
>  PropSetFile.o MultiplexExtension.o DirectorExtension.o SciTEProps.o StyleWriter.o Utf8_16.o \
> -	JobQueue.o GTKMutex.o IFaceTable.o $(COMPLIB) $(LUA_OBJS)
> -	$(CC) `$(CONFIGTHREADS)` -rdynamic -Wl,--as-needed -Wl,--version-script lua.vers -DGTK $^ -o $@ $(CONFIGLIB) $(LIBDL) -lstdc++
>diff -ruN --exclude=CVS /usr/ports/editors/scite/pkg-plist ./pkg-plist
>--- /usr/ports/editors/scite/pkg-plist	2012-04-04 20:16:43.000000000 -0400
>+++ ./pkg-plist	2012-08-12 14:49:49.000000000 -0400
>@@ -2,6 +2,7 @@
> share/applications/SciTE.desktop
> share/pixmaps/Sci48M.png
> %%PORTDOCS%%%%DOCSDIR%%/CommandValues.html
>+%%PORTDOCS%%%%DOCSDIR%%/PaneAPI.html
> %%PORTDOCS%%%%DOCSDIR%%/PrintHi.png
> %%PORTDOCS%%%%DOCSDIR%%/SciBreak2.jpg
> %%PORTDOCS%%%%DOCSDIR%%/SciTE.html
>@@ -68,6 +69,7 @@
> %%DATADIR%%/nncrontab.properties
> %%DATADIR%%/nsis.properties
> %%DATADIR%%/opal.properties
>+%%DATADIR%%/oscript.properties
> %%DATADIR%%/others.properties
> %%DATADIR%%/pascal.properties
> %%DATADIR%%/perl.properties

Actions: View | Diff

Attachments on bug 170565: 126801