diff options
| author | drochner <drochner@pkgsrc.org> | 2013-04-10 11:30:50 +0000 |
|---|---|---|
| committer | drochner <drochner@pkgsrc.org> | 2013-04-10 11:30:50 +0000 |
| commit | db8ee1bb0ba5e99ac12681f154af650e47a6d7af (patch) | |
| tree | b5c61bf1f5a20b13f344865ca0ac0f5d2ba725b1 /editors/scite/patches | |
| parent | e896e88e36c89da9c48b983870fb58e21d602d56 (diff) | |
| download | pkgsrc-db8ee1bb0ba5e99ac12681f154af650e47a6d7af.tar.gz | |
update to 3.2.5
changes: misc fixes and improvements
Diffstat (limited to 'editors/scite/patches')
| -rw-r--r-- | editors/scite/patches/patch-aa | 41 |
1 files changed, 27 insertions, 14 deletions
diff --git a/editors/scite/patches/patch-aa b/editors/scite/patches/patch-aa index 34c30097196..d7f5a661e72 100644 --- a/editors/scite/patches/patch-aa +++ b/editors/scite/patches/patch-aa @@ -1,22 +1,35 @@ -$NetBSD: patch-aa,v 1.3 2012/05/16 19:55:03 marino Exp $ +$NetBSD: patch-aa,v 1.4 2013/04/10 11:30:51 drochner Exp $ ---- gtk/makefile.orig 2011-09-16 09:14:07.000000000 +0000 +--- gtk/makefile.orig 2013-01-17 01:17:02.000000000 +0000 +++ gtk/makefile -@@ -22,7 +22,7 @@ endif - - # For the Gnome desktop stuff to work, prefix must point to where Gnome thinks it is. - 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-2.0) - CONFIGTHREADS:= - gnomeprefix:=$(shell pkg-config --variable=prefix $(GTKVERSION) 2>/dev/null) - ifndef prefix -@@ -99,7 +99,7 @@ deps: - $(CC) -MM $(CONFIGFLAGS) $(CXXFLAGS) *.cxx ../src/*.cxx | sed -e 's/\/usr.* //' | grep [a-zA-Z] >deps.mak +@@ -46,10 +46,10 @@ PROG = ../bin/SciTE + + all: $(PROG) + +-vpath %.h ../src ../../scintilla/include ++vpath %.h ../src $(prefix)/include/scintilla + vpath %.cxx ../src + +-INCLUDEDIRS=-I ../../scintilla/include -I ../src ++INCLUDEDIRS=-I $(prefix)/include/scintilla -I ../src + ifdef CHECK_DEPRECATED + DEPRECATED=-DGDK_PIXBUF_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED + endif +@@ -73,7 +73,7 @@ LUA_OBJS = LuaExtension.o $(LUA_CORE_OBJ + + vpath %.c ../lua/src ../lua/src/lib + +-INCLUDEDIRS=-I ../../scintilla/include -I ../src -I../lua/include ++INCLUDEDIRS=-I $(prefix)/include/scintilla -I ../src -I../lua/include + + .c.o: + $(CCOMP) $(CFLAGS) $(INCLUDEDIRS) -DLUA_USE_POSIX $(CXXTFLAGS) -c $< -o $@ +@@ -102,7 +102,7 @@ deps: + $(CC) -MM $(CONFIGFLAGS) $(CXXTFLAGS) *.cxx ../src/*.cxx | sed -e 's/\/usr.* //' | grep [a-zA-Z] >deps.mak # make should be run in ../../scintilla/gtk to compile all the lexers. -COMPLIB=../../scintilla/bin/scintilla.a +COMPLIB=$(prefix)/lib/scintilla.a $(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 \ |