Attachment 118363 Details for Bug 160599 – file.diff

[patch] file.diff

file.diff (text/plain), 2.48 KB, created by Brendan Fabeny on 2011-09-09 21:30:11 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Brendan Fabeny

Created: 2011-09-09 21:30:11 UTC

Size: 2.48 KB

patch

obsolete

>Index: files/patch-aa
>===================================================================
>RCS file: /home/pcvs/ports/editors/scite/files/patch-aa,v
>retrieving revision 1.23
>diff -u -r1.23 patch-aa
>--- files/patch-aa	5 Sep 2011 15:35:46 -0000	1.23
>+++ files/patch-aa	7 Sep 2011 02:02:53 -0000
>@@ -1,6 +1,6 @@
> --- makefile.orig	2011-07-31 22:49:29.000000000 -0400
>-+++ makefile	2011-09-03 16:25:52.000000000 -0400
>-@@ -5,13 +5,13 @@
>++++ makefile	2011-09-06 22:02:21.000000000 -0400
>+@@ -5,13 +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
>@@ -11,17 +11,10 @@
> -CC = g++
> -CCOMP = gcc
> -endif
>-+#ifdef CLANG
>-+#CC = clang
>-+#CCOMP = clang
>-+#else
>-+#CC = g++
>-+#CCOMP = gcc
>-+#endif
>  AR = ar
>  
>  ifdef GTK3
>-@@ -24,7 +24,7 @@
>+@@ -24,7 +17,7 @@
>  CONFIGFLAGS:=$(shell pkg-config --cflags $(GTKVERSION))
>  CONFIGLIB:=$(shell pkg-config --libs $(GTKVERSION) gthread-2.0)
>  CONFIGTHREADS:=
>@@ -30,15 +23,15 @@
>  ifndef prefix
>  ifdef gnomeprefix
>    prefix=$(gnomeprefix)
>-@@ -102,8 +102,9 @@
>+@@ -102,8 +95,9 @@
>  $(PROG): SciTEGTK.o GUIGTK.o Widget.o \
>  FilePath.o SciTEBase.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++
> +	JobQueue.o GTKMutex.o IFaceTable.o $(LUA_OBJS)
>-+	$(CC) $(CONFIGLIB) -lscintilla -lscintilla_lexers -lstdc++ \
>-+	-rdynamic -Wl,--as-needed -Wl,--version-script lua.vers -DGTK $^ -o $@
>++	$(CC) -DGTK $(CXXFLAGS) -rdynamic -Wl,--version-script lua.vers $(LDFLAGS) \
>++	-o $@ $^ -Wl,--as-needed -lscintilla -lscintilla_lexers $(CONFIGLIB)
>  
>  # Automatically generate header dependencies with "make deps"
>  include deps.mak
>Index: files/patch-src__FilePath.h
>===================================================================
>RCS file: files/patch-src__FilePath.h
>diff -N files/patch-src__FilePath.h
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ files/patch-src__FilePath.h	7 Sep 2011 01:44:29 -0000
>@@ -0,0 +1,10 @@
>+--- ../src/FilePath.h.orig	2011-07-31 22:49:30.000000000 -0400
>++++ ../src/FilePath.h	2011-09-06 21:43:03.000000000 -0400
>+@@ -13,6 +13,7 @@
>+ extern const GUI::gui_char fileWrite[];
>+ 
>+ #if defined(__unix__)
>++#include <cstdio>
>+ #include <limits.h>
>+ #ifdef PATH_MAX
>+ #define MAX_PATH PATH_MAX

Actions: View | Diff

Attachments on bug 160599: 118363