Downgraded to 3.6.0nb4, revert previous.

Update breaks gedit3 and updating gedit3 is not easy now.

4 files changed, 38 insertions, 19 deletions

diff --git a/x11/gtksourceview3/Makefile b/x11/gtksourceview3/Makefile
index a4399c67d0b..b8a52ca192a 100644
--- a/x11/gtksourceview3/Makefile
+++ b/x11/gtksourceview3/Makefile
@@ -1,10 +1,11 @@
-# $NetBSD: Makefile,v 1.12 2013/07/06 16:02:08 ryoon Exp $
+# $NetBSD: Makefile,v 1.13 2013/07/08 12:14:46 ryoon Exp $
 #
 
-DISTNAME=	gtksourceview-3.8.1
+DISTNAME=	gtksourceview-3.6.0
 PKGNAME=	${DISTNAME:S/gtksourceview/gtksourceview3/}
+PKGREVISION=	4
 CATEGORIES=	x11
-MASTER_SITES=	${MASTER_SITE_GNOME:=sources/gtksourceview/3.8/}
+MASTER_SITES=	${MASTER_SITE_GNOME:=sources/gtksourceview/3.6/}
 EXTRACT_SUFX=	.tar.xz
 
 MAINTAINER=	prlw1@cam.ac.uk
diff --git a/x11/gtksourceview3/PLIST b/x11/gtksourceview3/PLIST
index 877614852ea..ee03a950653 100644
--- a/x11/gtksourceview3/PLIST
+++ b/x11/gtksourceview3/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2013/07/06 16:02:08 ryoon Exp $
+@comment $NetBSD: PLIST,v 1.4 2013/07/08 12:14:46 ryoon Exp $
 include/gtksourceview-3.0/gtksourceview/completion-providers/words/gtksourcecompletionwords.h
 include/gtksourceview-3.0/gtksourceview/gtksource.h
 include/gtksourceview-3.0/gtksourceview/gtksourcebuffer.h
@@ -35,11 +35,7 @@ share/gtk-doc/html/gtksourceview-3.0/GtkSourceCompletionInfo.html
 share/gtk-doc/html/gtksourceview-3.0/GtkSourceCompletionItem.html
 share/gtk-doc/html/gtksourceview-3.0/GtkSourceCompletionProposal.html
 share/gtk-doc/html/gtksourceview-3.0/GtkSourceCompletionProvider.html
-share/gtk-doc/html/gtksourceview-3.0/GtkSourceCompletionWords.html
 share/gtk-doc/html/gtksourceview-3.0/GtkSourceGutter.html
-share/gtk-doc/html/gtksourceview-3.0/GtkSourceGutterRenderer.html
-share/gtk-doc/html/gtksourceview-3.0/GtkSourceGutterRendererPixbuf.html
-share/gtk-doc/html/gtksourceview-3.0/GtkSourceGutterRendererText.html
 share/gtk-doc/html/gtksourceview-3.0/GtkSourceLanguage.html
 share/gtk-doc/html/gtksourceview-3.0/GtkSourceLanguageManager.html
 share/gtk-doc/html/gtksourceview-3.0/GtkSourceMark.html
@@ -54,8 +50,9 @@ share/gtk-doc/html/gtksourceview-3.0/annotation-glossary.html
 share/gtk-doc/html/gtksourceview-3.0/api-index-3-0.html
 share/gtk-doc/html/gtksourceview-3.0/api-index-deprecated.html
 share/gtk-doc/html/gtksourceview-3.0/api-index-full.html
-share/gtk-doc/html/gtksourceview-3.0/ch01.html
-share/gtk-doc/html/gtksourceview-3.0/ch02.html
+share/gtk-doc/html/gtksourceview-3.0/gtksourceview-3.0-GtkSourceGutterRenderer.html
+share/gtk-doc/html/gtksourceview-3.0/gtksourceview-3.0-GtkSourceGutterRendererPixbuf.html
+share/gtk-doc/html/gtksourceview-3.0/gtksourceview-3.0-GtkSourceGutterRendererText.html
 share/gtk-doc/html/gtksourceview-3.0/gtksourceview-3.0.devhelp2
 share/gtk-doc/html/gtksourceview-3.0/home.png
 share/gtk-doc/html/gtksourceview-3.0/index.html
@@ -63,8 +60,9 @@ share/gtk-doc/html/gtksourceview-3.0/index.sgml
 share/gtk-doc/html/gtksourceview-3.0/lang-reference.html
 share/gtk-doc/html/gtksourceview-3.0/lang-tutorial.html
 share/gtk-doc/html/gtksourceview-3.0/left.png
-share/gtk-doc/html/gtksourceview-3.0/object-tree.html
 share/gtk-doc/html/gtksourceview-3.0/right.png
+share/gtk-doc/html/gtksourceview-3.0/rn01.html
+share/gtk-doc/html/gtksourceview-3.0/rn02.html
 share/gtk-doc/html/gtksourceview-3.0/style-reference.html
 share/gtk-doc/html/gtksourceview-3.0/style.css
 share/gtk-doc/html/gtksourceview-3.0/up.png
@@ -76,12 +74,12 @@ share/gtksourceview-3.0/language-specs/automake.lang
 share/gtksourceview-3.0/language-specs/awk.lang
 share/gtksourceview-3.0/language-specs/bennugd.lang
 share/gtksourceview-3.0/language-specs/bibtex.lang
-share/gtksourceview-3.0/language-specs/bluespec.lang
 share/gtksourceview-3.0/language-specs/boo.lang
 share/gtksourceview-3.0/language-specs/c.lang
 share/gtksourceview-3.0/language-specs/cg.lang
 share/gtksourceview-3.0/language-specs/changelog.lang
 share/gtksourceview-3.0/language-specs/chdr.lang
+share/gtksourceview-3.0/language-specs/check-language.sh
 share/gtksourceview-3.0/language-specs/cmake.lang
 share/gtksourceview-3.0/language-specs/cobol.lang
 share/gtksourceview-3.0/language-specs/cpp.lang
@@ -113,7 +111,6 @@ share/gtksourceview-3.0/language-specs/haddock.lang
 share/gtksourceview-3.0/language-specs/haskell-literate.lang
 share/gtksourceview-3.0/language-specs/haskell.lang
 share/gtksourceview-3.0/language-specs/html.lang
-share/gtksourceview-3.0/language-specs/idl-exelis.lang
 share/gtksourceview-3.0/language-specs/idl.lang
 share/gtksourceview-3.0/language-specs/imagej.lang
 share/gtksourceview-3.0/language-specs/ini.lang
@@ -132,7 +129,6 @@ share/gtksourceview-3.0/language-specs/makefile.lang
 share/gtksourceview-3.0/language-specs/mallard.lang
 share/gtksourceview-3.0/language-specs/markdown.lang
 share/gtksourceview-3.0/language-specs/matlab.lang
-share/gtksourceview-3.0/language-specs/modelica.lang
 share/gtksourceview-3.0/language-specs/mxml.lang
 share/gtksourceview-3.0/language-specs/nemerle.lang
 share/gtksourceview-3.0/language-specs/netrexx.lang
@@ -174,6 +170,7 @@ share/gtksourceview-3.0/language-specs/vhdl.lang
 share/gtksourceview-3.0/language-specs/xml.lang
 share/gtksourceview-3.0/language-specs/xslt.lang
 share/gtksourceview-3.0/language-specs/yacc.lang
+share/gtksourceview-3.0/styles/check-style.sh
 share/gtksourceview-3.0/styles/classic.xml
 share/gtksourceview-3.0/styles/cobalt.xml
 share/gtksourceview-3.0/styles/kate.xml
@@ -250,7 +247,6 @@ share/locale/sr@latin/LC_MESSAGES/gtksourceview-3.0.mo
 share/locale/sv/LC_MESSAGES/gtksourceview-3.0.mo
 share/locale/ta/LC_MESSAGES/gtksourceview-3.0.mo
 share/locale/te/LC_MESSAGES/gtksourceview-3.0.mo
-share/locale/tg/LC_MESSAGES/gtksourceview-3.0.mo
 share/locale/th/LC_MESSAGES/gtksourceview-3.0.mo
 share/locale/tr/LC_MESSAGES/gtksourceview-3.0.mo
 share/locale/ug/LC_MESSAGES/gtksourceview-3.0.mo
diff --git a/x11/gtksourceview3/distinfo b/x11/gtksourceview3/distinfo
index 9cbc62a2a59..62cd22f675d 100644
--- a/x11/gtksourceview3/distinfo
+++ b/x11/gtksourceview3/distinfo
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.3 2013/07/06 16:02:08 ryoon Exp $
+$NetBSD: distinfo,v 1.4 2013/07/08 12:14:46 ryoon Exp $
 
-SHA1 (gtksourceview-3.8.1.tar.xz) = b291f6f67d0a1d6b04f2ab1697586a7b5982810c
-RMD160 (gtksourceview-3.8.1.tar.xz) = 6213bb2f35ee121a2507b23a09249c6d27844212
-Size (gtksourceview-3.8.1.tar.xz) = 1262676 bytes
+SHA1 (gtksourceview-3.6.0.tar.xz) = 55be2eab05078d634b2c4f3305e1b7fb93d321ab
+RMD160 (gtksourceview-3.6.0.tar.xz) = fbeb05e6bfd3307594f5770843aa590a49d2f0ad
+Size (gtksourceview-3.6.0.tar.xz) = 1216008 bytes
+SHA1 (patch-gtksourceview_gtksourceview.h) = 1a12fbf538fd12e35aec5543716d0714c03ec25d
diff --git a/x11/gtksourceview3/patches/patch-gtksourceview_gtksourceview.h b/x11/gtksourceview3/patches/patch-gtksourceview_gtksourceview.h
new file mode 100644
index 00000000000..f38a9f626a6
--- /dev/null
+++ b/x11/gtksourceview3/patches/patch-gtksourceview_gtksourceview.h
@@ -0,0 +1,21 @@
+$NetBSD: patch-gtksourceview_gtksourceview.h,v 1.3 2013/07/08 12:14:46 ryoon Exp $
+
+Continuation lines not parsed correctly in enum.
+
+--- gtksourceview/gtksourceview.h.orig	2011-09-12 13:03:15.000000000 +0000
++++ gtksourceview/gtksourceview.h
+@@ -130,13 +130,7 @@ typedef enum
+ 	GTK_SOURCE_DRAW_SPACES_LEADING    = 1 << 4,
+ 	GTK_SOURCE_DRAW_SPACES_TEXT       = 1 << 5,
+ 	GTK_SOURCE_DRAW_SPACES_TRAILING   = 1 << 6,
+-	GTK_SOURCE_DRAW_SPACES_ALL        = (GTK_SOURCE_DRAW_SPACES_SPACE   | \
+-	                                     GTK_SOURCE_DRAW_SPACES_TAB     | \
+-	                                     GTK_SOURCE_DRAW_SPACES_NEWLINE | \
+-	                                     GTK_SOURCE_DRAW_SPACES_NBSP | \
+-	                                     GTK_SOURCE_DRAW_SPACES_LEADING | \
+-	                                     GTK_SOURCE_DRAW_SPACES_TEXT | \
+-	                                     GTK_SOURCE_DRAW_SPACES_TRAILING)
++	GTK_SOURCE_DRAW_SPACES_ALL        = (GTK_SOURCE_DRAW_SPACES_SPACE   | GTK_SOURCE_DRAW_SPACES_TAB | GTK_SOURCE_DRAW_SPACES_NEWLINE | GTK_SOURCE_DRAW_SPACES_NBSP | GTK_SOURCE_DRAW_SPACES_LEADING | GTK_SOURCE_DRAW_SPACES_TEXT | GTK_SOURCE_DRAW_SPACES_TRAILING)
+ } GtkSourceDrawSpacesFlags;
+ 
+