Attachment #99018 for bug #138015

View | Details | Raw Unified | Return to bug 138015
Collapse All | Expand All

Lines 6-12 Link Here

(-)/kirby/shared/ports/scintilla/Makefile (-1 / +1 lines)
6	# $MCom: ports/x11-toolkits/scintilla/Makefile,v 1.3 2006/09/17 21:58:56 marcus Exp $	6	# $MCom: ports/x11-toolkits/scintilla/Makefile,v 1.3 2006/09/17 21:58:56 marcus Exp $
7		7
8	PORTNAME= scintilla	8	PORTNAME= scintilla
9	PORTVERSION= 2.00	9	PORTVERSION= 2.01
10	CATEGORIES= x11-toolkits	10	CATEGORIES= x11-toolkits
11	MASTER_SITES= SFP/scintilla/SciTE/${PORTVERSION}	11	MASTER_SITES= SFP/scintilla/SciTE/${PORTVERSION}
12	DISTNAME= scite${PORTVERSION:S/.//g}	12	DISTNAME= scite${PORTVERSION:S/.//g}

Lines 1-3 Link Here

(-)/kirby/shared/ports/scintilla/distinfo (-3 / +3 lines)
1	MD5 (scite200.tgz) = fe6ba62eaf86ec0a49e03d2a03c3e048	1	MD5 (scite201.tgz) = ef4b6b4d903c29e4ab511488a0d20f46
2	SHA256 (scite200.tgz) = 56be771b4aaf9a0e0b601dea374f12926fc1c2eb1b91ab8783165143c8d7b210	2	SHA256 (scite201.tgz) = 32dc19abd1a042e5aa8b07ea83a5ef62ab9e3c3dfba3f962dcdd670ef8ab84c5
3	SIZE (scite200.tgz) = 1810957	3	SIZE (scite201.tgz) = 1810998




--- makefile.orig	2009-08-12 21:35:23.000000000 -0400
+++ makefile	2009-08-21 01:58:12.000000000 -0400
@@ -8,16 +8,17 @@
 # To force GTK+ 1 build, define GTK1 on the make command line.
 

 # If explicit setting of GTK1 or GTK2 then use that else look for
 # pkg-config which is an OK indication that GTK2 is available
 ifdef GTK2
-CONFIGFLAGS:=$(shell pkg-config --cflags gtk+-2.0)
+CONFIGFLAGS:=$(shell pkg-config --cflags gtk+-2.0 gthread-2.0)
 MARSHALLER=scintilla-marshal.o
 else
 ifdef GTK1
-CONFIGFLAGS:=$(shell gtk-config --cflags)
+CONFIGFLAGS:=$(shell pkg-config --cflags gtk+ gthread)
 else
 ifneq (,$(findstring /,$(shell whereis pkg-config)))
-CONFIGFLAGS:=$(shell pkg-config --cflags gtk+-2.0)
+CONFIGFLAGS:=$(shell pkg-config --cflags gtk+-2.0 gthread-2.0)
 MARSHALLER=scintilla-marshal.o
 else
-CONFIGFLAGS:=$(shell gtk-config --cflags)
+CONFIGFLAGS:=$(shell pkg-config --cflags gtk+ gthread)
 endif
 endif
 endif

Return to bug 138015

Lines 1-5 Link Here

(-)/kirby/shared/ports/scintilla/files/patch-aa (-10 / +10 lines)
1	--- makefile.orig 2009-07-03 01:48:46.000000000 -0400	1	--- makefile.orig 2009-08-12 21:35:23.000000000 -0400
2	+++ makefile 2009-08-11 12:37:37.000000000 -0400	2	+++ makefile 2009-08-21 01:58:12.000000000 -0400
3	@@ -8,16 +8,17 @@	3	@@ -8,16 +8,17 @@
4	# To force GTK+ 1 build, define GTK1 on the make command line.	4	# To force GTK+ 1 build, define GTK1 on the make command line.
5		5
Lines 36-56 Link Here
36	# If explicit setting of GTK1 or GTK2 then use that else look for	36	# If explicit setting of GTK1 or GTK2 then use that else look for
37	# pkg-config which is an OK indication that GTK2 is available	37	# pkg-config which is an OK indication that GTK2 is available
38	ifdef GTK2	38	ifdef GTK2
39	-CONFIGFLAGS=$(shell pkg-config --cflags gtk+-2.0)	39	-CONFIGFLAGS:=$(shell pkg-config --cflags gtk+-2.0)
40	+CONFIGFLAGS=$(shell pkg-config --cflags gtk+-2.0 gthread-2.0)	40	+CONFIGFLAGS:=$(shell pkg-config --cflags gtk+-2.0 gthread-2.0)
41	MARSHALLER=scintilla-marshal.o	41	MARSHALLER=scintilla-marshal.o
42	else	42	else
43	ifdef GTK1	43	ifdef GTK1
44	-CONFIGFLAGS=$(shell gtk-config --cflags)	44	-CONFIGFLAGS:=$(shell gtk-config --cflags)
45	+CONFIGFLAGS=$(shell pkg-config --cflags gtk+ gthread)	45	+CONFIGFLAGS:=$(shell pkg-config --cflags gtk+ gthread)
46	else	46	else
47	ifneq (,$(findstring /,$(shell whereis pkg-config)))	47	ifneq (,$(findstring /,$(shell whereis pkg-config)))
48	-CONFIGFLAGS=$(shell pkg-config --cflags gtk+-2.0)	48	-CONFIGFLAGS:=$(shell pkg-config --cflags gtk+-2.0)
49	+CONFIGFLAGS=$(shell pkg-config --cflags gtk+-2.0 gthread-2.0)	49	+CONFIGFLAGS:=$(shell pkg-config --cflags gtk+-2.0 gthread-2.0)
50	MARSHALLER=scintilla-marshal.o	50	MARSHALLER=scintilla-marshal.o
51	else	51	else
52	-CONFIGFLAGS=$(shell gtk-config --cflags)	52	-CONFIGFLAGS:=$(shell gtk-config --cflags)
53	+CONFIGFLAGS=$(shell pkg-config --cflags gtk+ gthread)	53	+CONFIGFLAGS:=$(shell pkg-config --cflags gtk+ gthread)
54	endif	54	endif
55	endif	55	endif
56	endif	56	endif