summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormarino <marino@pkgsrc.org>2012-05-16 19:55:02 +0000
committermarino <marino@pkgsrc.org>2012-05-16 19:55:02 +0000
commit7136029b33ee4c0ca785a24f314f23bf22600b6b (patch)
treeb651f76ce1a7ed62152a67050097c091d8ed17af
parente19fea1ac2ca006980033caf1fe69de1ae6fda25 (diff)
downloadpkgsrc-7136029b33ee4c0ca785a24f314f23bf22600b6b.tar.gz
editors/scite: Fix indirect linking (all platforms)
Due to the use of pkg-config to generate libraries inside the gtk/makefile file, the indirect linking fix couldn't be isolated to only DragonFly. All platforms will directly link libgmodule-2.0
-rw-r--r--editors/scite/distinfo4
-rw-r--r--editors/scite/patches/patch-aa15
2 files changed, 14 insertions, 5 deletions
diff --git a/editors/scite/distinfo b/editors/scite/distinfo
index b7586a3674d..474f3adb0f5 100644
--- a/editors/scite/distinfo
+++ b/editors/scite/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.3 2012/01/12 11:39:38 drochner Exp $
+$NetBSD: distinfo,v 1.4 2012/05/16 19:55:02 marino Exp $
SHA1 (scite229.tgz) = 153cc063b77d7ad95d265327f76ff6b4ed91c108
RMD160 (scite229.tgz) = 5afa506eb5848e4bc99ef597ac0c5f1988afdbf9
Size (scite229.tgz) = 1883704 bytes
-SHA1 (patch-aa) = ebe6ab3fe31fd85c09bb16c39441b69a6690f608
+SHA1 (patch-aa) = d778a33314efdd098d22e5dc7ddb833066584720
diff --git a/editors/scite/patches/patch-aa b/editors/scite/patches/patch-aa
index 869841ba44b..34c30097196 100644
--- a/editors/scite/patches/patch-aa
+++ b/editors/scite/patches/patch-aa
@@ -1,8 +1,17 @@
-$NetBSD: patch-aa,v 1.2 2012/01/12 11:39:38 drochner Exp $
+$NetBSD: patch-aa,v 1.3 2012/05/16 19:55:03 marino Exp $
---- gtk/makefile.orig 2011-08-01 02:49:29.000000000 +0000
+--- gtk/makefile.orig 2011-09-16 09:14:07.000000000 +0000
+++ gtk/makefile
-@@ -97,7 +97,7 @@ deps:
+@@ -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
# make should be run in ../../scintilla/gtk to compile all the lexers.