FreeBSD Bugzilla – Attachment 144640 Details for
Bug 190754
[MAINTAINER] x11-toolkits/scintilla & editors/scite: update to 3.4.4
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
scite-3.4.4.patch
scite-3.4.4.patch (text/plain), 3.15 KB, created by
Naram Qashat
on 2014-07-13 19:38:49 UTC
(
hide
)
Description:
scite-3.4.4.patch
Filename:
MIME Type:
Creator:
Naram Qashat
Created:
2014-07-13 19:38:49 UTC
Size:
3.15 KB
patch
obsolete
>Index: Makefile >=================================================================== >--- Makefile (revision 356915) >+++ Makefile (working copy) >@@ -2,7 +2,7 @@ > # $FreeBSD$ > > PORTNAME= scite >-PORTVERSION= 3.4.1 >+PORTVERSION= 3.4.4 > CATEGORIES= editors gnome > MASTER_SITES= SF/scintilla/SciTE/${PORTVERSION} > DISTNAME= ${PORTNAME}${PORTVERSION:S/.//g} >Index: distinfo >=================================================================== >--- distinfo (revision 356915) >+++ distinfo (working copy) >@@ -1,2 +1,2 @@ >-SHA256 (scite341.tgz) = ab2940ba6ad3f1c7c33aea233dd5b44efc75319062fe0b3625db04c747bf3341 >-SIZE (scite341.tgz) = 2237159 >+SHA256 (scite344.tgz) = e3c477d96ab233e526020ff176b7113ada0cdf90425765ca5cb7c48e55317995 >+SIZE (scite344.tgz) = 2244513 >Index: files/patch-makefile >=================================================================== >--- files/patch-makefile (revision 356915) >+++ files/patch-makefile (working copy) >@@ -1,12 +1,16 @@ >---- makefile.orig 2013-10-13 23:38:06.000000000 +0200 >-+++ makefile 2014-01-27 15:50:05.858185668 +0100 >-@@ -5,13 +5,6 @@ >+--- ./makefile.orig 2014-05-25 22:01:00.000000000 -0400 >++++ ./makefile 2014-06-07 11:45:11.000000000 -0400 >+@@ -5,17 +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 -fsanitize=address --std=c++0x >--CCOMP = clang -fsanitize=address -Wno-empty-body >+-# Can choose aspect to sanitize: address and undefined can simply change SANITIZE but for >+-# thread also need to create Position Independent Executable -> search online documentation >+-SANITIZE = address >+-#SANITIZE = undefined >+-CC = clang++ -fsanitize=$(SANITIZE) --std=c++0x >+-CCOMP = clang -fsanitize=$(SANITIZE) -Wno-empty-body > -else > -CC = g++ > -CCOMP = gcc >@@ -14,7 +18,7 @@ > AR = ar > > ifdef GTK3 >-@@ -24,7 +17,7 @@ >+@@ -28,7 +17,7 @@ > CONFIGFLAGS:=$(shell pkg-config --cflags $(GTKVERSION)) > CONFIGLIB:=$(shell pkg-config --libs $(GTKVERSION) gthread-2.0 gmodule-no-export-2.0) > CONFIGTHREADS:= >@@ -23,15 +27,15 @@ > ifndef prefix > ifdef gnomeprefix > prefix=$(gnomeprefix) >-@@ -116,8 +109,9 @@ >- $(PROG): SciTEGTK.o GUIGTK.o Widget.o \ >- FilePath.o SciTEBase.o FileWorker.o Cookie.o Credits.o SciTEBuffers.o SciTEIO.o StringList.o Exporters.o StringHelpers.o \ >+@@ -117,8 +106,9 @@ >+ FilePath.o SciTEBase.o FileWorker.o Cookie.o Credits.o SciTEBuffers.o SciTEIO.o StringList.o \ >+ Exporters.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) > - $(CC) `$(CONFIGTHREADS)` -rdynamic -Wl,--as-needed -Wl,--version-script lua.vers -DGTK $^ -o $@ $(CONFIGLIB) $(LIBDL) -lm -lstdc++ > + JobQueue.o GTKMutex.o IFaceTable.o $(LUA_OBJS) >-+ $(CC) -DGTK $(CXXFLAGS) -rdynamic -Wl,--version-script lua.vers $(LDFLAGS) \ >-+ -o $@ $^ -lscintilla -lscintilla_lexers -Wl,--as-needed $(CONFIGLIB) >++ $(CC) -rdynamic -Wl,--version-script lua.vers -DGTK $(CXXFLAGS) $^ -o $@ \ >++ $(LDFLAGS) -lscintilla -lscintilla_lexers -Wl,--as-needed $(CONFIGLIB) > > # Automatically generate header dependencies with "make deps" > include deps.mak
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 190754
:
143492
|
143493
|
143494
|
144639
|
144640
|
145445
|
145498