Mon Jan 12 21:50:17 2009 UTC ()
Update to 2.24.3; make spell checking an option; update dependencies.

============
gedit 2.24.3
============

New Features and Fixes
======================
- Backport some bugfixes from the developement version

New and updated translations
============================
- Alexander Shopov (bg)
- Priit Laes (et)
- Shankar Prasad (kn)


(wiz)
diff -r1.89 -r1.90 pkgsrc/editors/gedit/Makefile
diff -r1.32 -r1.33 pkgsrc/editors/gedit/PLIST
diff -r1.39 -r1.40 pkgsrc/editors/gedit/distinfo
diff -r0 -r1.1 pkgsrc/editors/gedit/options.mk
diff -r1.8 -r1.9 pkgsrc/editors/gedit/patches/patch-aa
diff -r1.5 -r0 pkgsrc/editors/gedit/patches/patch-ab

cvs diff -r1.89 -r1.90 pkgsrc/editors/gedit/Makefile (expand / switch to unified diff)

--- pkgsrc/editors/gedit/Makefile 2008/12/24 17:56:11 1.89
+++ pkgsrc/editors/gedit/Makefile 2009/01/12 21:50:16 1.90
@@ -1,54 +1,46 @@ @@ -1,54 +1,46 @@
1# $NetBSD: Makefile,v 1.89 2008/12/24 17:56:11 jmcneill Exp $ 1# $NetBSD: Makefile,v 1.90 2009/01/12 21:50:16 wiz Exp $
2# 2#
3 3
4DISTNAME= gedit-2.24.2 4DISTNAME= gedit-2.24.3
5CATEGORIES= editors gnome 5CATEGORIES= editors gnome
6MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gedit/2.24/} 6MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gedit/2.24/}
7EXTRACT_SUFX= .tar.bz2 7EXTRACT_SUFX= .tar.bz2
8 8
9MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= http://www.gnome.org/projects/gedit/ 10HOMEPAGE= http://www.gnome.org/projects/gedit/
11COMMENT= Lightweight GNOME2 text editor 11COMMENT= Lightweight GNOME2 text editor
12 12
13PKG_DESTDIR_SUPPORT= user-destdir 13PKG_DESTDIR_SUPPORT= user-destdir
14 14
15USE_DIRS+= gnome2-1.5 15USE_DIRS+= gnome2-1.5
16USE_PKGLOCALEDIR= YES 16USE_PKGLOCALEDIR= YES
17USE_TOOLS+= gmake intltool msgfmt perl pkg-config 17USE_TOOLS+= gmake intltool msgfmt perl pkg-config
18USE_TOOLS+= autoconf 
19USE_LIBTOOL= YES 18USE_LIBTOOL= YES
20GNU_CONFIGURE= YES 19GNU_CONFIGURE= YES
21 20
22PKGCONFIG_OVERRIDE+= data/gedit.pc.in 21PKGCONFIG_OVERRIDE+= data/gedit.pc.in
23 22
24GCONF_SCHEMAS= gedit.schemas gedit-file-browser.schemas 23GCONF_SCHEMAS= gedit.schemas gedit-file-browser.schemas
25 24
26# XXX option? 25.include "options.mk"
27.include "../../textproc/enchant/buildlink3.mk" 
28.include "../../textproc/iso-codes/buildlink3.mk" 
29#CONFIGURE_ARGS+= --disable-spell 
30 
31BUILDLINK_API_DEPENDS.glib2+= glib2>=2.12.0 
32BUILDLINK_API_DEPENDS.gtk2+= gtk2+>=2.10.0 
33#BUILDLINK_API_DEPENDS.gtksourceview+= gtksourceview>=1.8.0 
34BUILDLINK_API_DEPENDS.libglade+= libglade>=2.6.0 
35BUILDLINK_API_DEPENDS.libgnomeui+= libgnomeui>=2.16.0 
36BUILDLINK_API_DEPENDS.gnome-vfs+= gnome-vfs>=2.16.0 
37 
38pre-configure: 
39 cd ${WRKSRC} && autoconf -f 
40 26
41.include "../../devel/GConf/schemas.mk" 27.include "../../devel/GConf/schemas.mk"
42.include "../../devel/gettext-lib/buildlink3.mk" 28.include "../../devel/gettext-lib/buildlink3.mk"
 29BUILDLINK_API_DEPENDS.glib2+= glib2>=2.16.0
43.include "../../devel/glib2/buildlink3.mk" 30.include "../../devel/glib2/buildlink3.mk"
44.include "../../devel/libbonobo/buildlink3.mk" 31.include "../../devel/libbonobo/buildlink3.mk"
 32BUILDLINK_API_DEPENDS.libglade+= libglade>=2.6.0
45.include "../../devel/libglade/buildlink3.mk" 33.include "../../devel/libglade/buildlink3.mk"
 34BUILDLINK_API_DEPENDS.libgnomeui+= libgnomeui>=2.16.0
46.include "../../devel/libgnomeui/buildlink3.mk" 35.include "../../devel/libgnomeui/buildlink3.mk"
47.include "../../net/ORBit2/buildlink3.mk" 36.include "../../net/ORBit2/buildlink3.mk"
48.include "../../sysutils/desktop-file-utils/desktopdb.mk" 37.include "../../sysutils/desktop-file-utils/desktopdb.mk"
49.include "../../sysutils/gnome-vfs/buildlink3.mk" 38#BUILDLINK_API_DEPENDS.gnome-vfs+= gnome-vfs>=2.16.0
 39#.include "../../sysutils/gnome-vfs/buildlink3.mk"
50.include "../../textproc/gnome-doc-utils/buildlink3.mk" 40.include "../../textproc/gnome-doc-utils/buildlink3.mk"
51.include "../../mk/omf-scrollkeeper.mk" 41.include "../../mk/omf-scrollkeeper.mk"
 42BUILDLINK_API_DEPENDS.gtk2+= gtk2+>=2.13.0
52.include "../../x11/gtk2/buildlink3.mk" 43.include "../../x11/gtk2/buildlink3.mk"
 44BUILDLINK_API_DEPENDS.gtksourceview2+= gtksourceview2>=2.2.0
53.include "../../x11/gtksourceview2/buildlink3.mk" 45.include "../../x11/gtksourceview2/buildlink3.mk"
54.include "../../mk/bsd.pkg.mk" 46.include "../../mk/bsd.pkg.mk"

cvs diff -r1.32 -r1.33 pkgsrc/editors/gedit/PLIST (expand / switch to unified diff)

--- pkgsrc/editors/gedit/PLIST 2008/11/24 13:39:29 1.32
+++ pkgsrc/editors/gedit/PLIST 2009/01/12 21:50:17 1.33
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1@comment $NetBSD: PLIST,v 1.32 2008/11/24 13:39:29 wiz Exp $ 1@comment $NetBSD: PLIST,v 1.33 2009/01/12 21:50:17 wiz Exp $
2bin/gedit 2bin/gedit
3bin/gnome-text-editor 3bin/gnome-text-editor
4include/gedit-2.20/gedit/gedit-app.h 4include/gedit-2.20/gedit/gedit-app.h
5include/gedit-2.20/gedit/gedit-convert.h 5include/gedit-2.20/gedit/gedit-convert.h
6include/gedit-2.20/gedit/gedit-debug.h 6include/gedit-2.20/gedit/gedit-debug.h
7include/gedit-2.20/gedit/gedit-document.h 7include/gedit-2.20/gedit/gedit-document.h
8include/gedit-2.20/gedit/gedit-encodings-option-menu.h 8include/gedit-2.20/gedit/gedit-encodings-option-menu.h
9include/gedit-2.20/gedit/gedit-encodings.h 9include/gedit-2.20/gedit/gedit-encodings.h
10include/gedit-2.20/gedit/gedit-file-chooser-dialog.h 10include/gedit-2.20/gedit/gedit-file-chooser-dialog.h
11include/gedit-2.20/gedit/gedit-help.h 11include/gedit-2.20/gedit/gedit-help.h
12include/gedit-2.20/gedit/gedit-message-area.h 12include/gedit-2.20/gedit/gedit-message-area.h
13include/gedit-2.20/gedit/gedit-metadata-manager.h 13include/gedit-2.20/gedit/gedit-metadata-manager.h
14include/gedit-2.20/gedit/gedit-notebook.h 14include/gedit-2.20/gedit/gedit-notebook.h
@@ -23,48 +23,48 @@ include/gedit-2.20/gedit/gedit-utils.h @@ -23,48 +23,48 @@ include/gedit-2.20/gedit/gedit-utils.h
23include/gedit-2.20/gedit/gedit-view.h 23include/gedit-2.20/gedit/gedit-view.h
24include/gedit-2.20/gedit/gedit-window.h 24include/gedit-2.20/gedit/gedit-window.h
25lib/gedit-2/plugins/changecase.gedit-plugin 25lib/gedit-2/plugins/changecase.gedit-plugin
26lib/gedit-2/plugins/docinfo.gedit-plugin 26lib/gedit-2/plugins/docinfo.gedit-plugin
27lib/gedit-2/plugins/filebrowser.gedit-plugin 27lib/gedit-2/plugins/filebrowser.gedit-plugin
28lib/gedit-2/plugins/indent.gedit-plugin 28lib/gedit-2/plugins/indent.gedit-plugin
29lib/gedit-2/plugins/libchangecase.la 29lib/gedit-2/plugins/libchangecase.la
30lib/gedit-2/plugins/libdocinfo.la 30lib/gedit-2/plugins/libdocinfo.la
31lib/gedit-2/plugins/libfilebrowser.la 31lib/gedit-2/plugins/libfilebrowser.la
32lib/gedit-2/plugins/libindent.la 32lib/gedit-2/plugins/libindent.la
33lib/gedit-2/plugins/libmodelines.la 33lib/gedit-2/plugins/libmodelines.la
34lib/gedit-2/plugins/libsample.la 34lib/gedit-2/plugins/libsample.la
35lib/gedit-2/plugins/libsort.la 35lib/gedit-2/plugins/libsort.la
36lib/gedit-2/plugins/libspell.la 36${PLIST.enchant}lib/gedit-2/plugins/libspell.la
37lib/gedit-2/plugins/libtaglist.la 37lib/gedit-2/plugins/libtaglist.la
38lib/gedit-2/plugins/libtime.la 38lib/gedit-2/plugins/libtime.la
39lib/gedit-2/plugins/modelines.gedit-plugin 39lib/gedit-2/plugins/modelines.gedit-plugin
40lib/gedit-2/plugins/sample.gedit-plugin 40lib/gedit-2/plugins/sample.gedit-plugin
41lib/gedit-2/plugins/sort.gedit-plugin 41lib/gedit-2/plugins/sort.gedit-plugin
42lib/gedit-2/plugins/spell.gedit-plugin 42${PLIST.enchant}lib/gedit-2/plugins/spell.gedit-plugin
43lib/gedit-2/plugins/taglist.gedit-plugin 43lib/gedit-2/plugins/taglist.gedit-plugin
44lib/gedit-2/plugins/time.gedit-plugin 44lib/gedit-2/plugins/time.gedit-plugin
45lib/pkgconfig/gedit-2.20.pc 45lib/pkgconfig/gedit-2.20.pc
46libexec/gedit-2/gedit-bugreport.sh 46libexec/gedit-2/gedit-bugreport.sh
47man/man1/gedit.1 47man/man1/gedit.1
48share/applications/gedit.desktop 48share/applications/gedit.desktop
49share/gconf/schemas/gedit-file-browser.schemas 49share/gconf/schemas/gedit-file-browser.schemas
50share/gconf/schemas/gedit.schemas 50share/gconf/schemas/gedit.schemas
51share/gedit-2/icons/gedit-plugin.png 51share/gedit-2/icons/gedit-plugin.png
52share/gedit-2/logo/gedit-logo.png 52share/gedit-2/logo/gedit-logo.png
53share/gedit-2/plugins/docinfo/docinfo.ui 53share/gedit-2/plugins/docinfo/docinfo.ui
54share/gedit-2/plugins/filebrowser/gedit-file-browser-widget-ui.xml 54share/gedit-2/plugins/filebrowser/gedit-file-browser-widget-ui.xml
55share/gedit-2/plugins/sort/sort.ui 55share/gedit-2/plugins/sort/sort.ui
56share/gedit-2/plugins/spell/languages-dialog.ui 56${PLIST.enchant}share/gedit-2/plugins/spell/languages-dialog.ui
57share/gedit-2/plugins/spell/spell-checker.ui 57${PLIST.enchant}share/gedit-2/plugins/spell/spell-checker.ui
58share/gedit-2/plugins/time/time.ui 58share/gedit-2/plugins/time/time.ui
59share/gedit-2/taglist/HTML.tags.gz 59share/gedit-2/taglist/HTML.tags.gz
60share/gedit-2/taglist/Latex.tags.gz 60share/gedit-2/taglist/Latex.tags.gz
61share/gedit-2/taglist/XSLT.tags.gz 61share/gedit-2/taglist/XSLT.tags.gz
62share/gedit-2/taglist/XUL.tags.gz 62share/gedit-2/taglist/XUL.tags.gz
63share/gedit-2/ui/gedit-encodings-dialog.ui 63share/gedit-2/ui/gedit-encodings-dialog.ui
64share/gedit-2/ui/gedit-open-location-dialog.ui 64share/gedit-2/ui/gedit-open-location-dialog.ui
65share/gedit-2/ui/gedit-preferences-dialog.ui 65share/gedit-2/ui/gedit-preferences-dialog.ui
66share/gedit-2/ui/gedit-print-preferences.ui 66share/gedit-2/ui/gedit-print-preferences.ui
67share/gedit-2/ui/gedit-search-dialog.ui 67share/gedit-2/ui/gedit-search-dialog.ui
68share/gedit-2/ui/gedit-ui.xml 68share/gedit-2/ui/gedit-ui.xml
69share/gnome/help/gedit/C/figures/gedit_format_bold.png 69share/gnome/help/gedit/C/figures/gedit_format_bold.png
70share/gnome/help/gedit/C/figures/gedit_format_italic.png 70share/gnome/help/gedit/C/figures/gedit_format_italic.png
@@ -406,27 +406,27 @@ share/omf/gedit/gedit-zh_TW.omf @@ -406,27 +406,27 @@ share/omf/gedit/gedit-zh_TW.omf
406@dirrm share/gnome/help/gedit/de/figures 406@dirrm share/gnome/help/gedit/de/figures
407@dirrm share/gnome/help/gedit/de 407@dirrm share/gnome/help/gedit/de
408@dirrm share/gnome/help/gedit/da/figures 408@dirrm share/gnome/help/gedit/da/figures
409@dirrm share/gnome/help/gedit/da 409@dirrm share/gnome/help/gedit/da
410@dirrm share/gnome/help/gedit/bg/figures 410@dirrm share/gnome/help/gedit/bg/figures
411@dirrm share/gnome/help/gedit/bg 411@dirrm share/gnome/help/gedit/bg
412@dirrm share/gnome/help/gedit/C/figures 412@dirrm share/gnome/help/gedit/C/figures
413@dirrm share/gnome/help/gedit/C 413@dirrm share/gnome/help/gedit/C
414@dirrm share/gnome/help/gedit 414@dirrm share/gnome/help/gedit
415@comment in gnome2-dirs: @dirrm share/gnome/help 415@comment in gnome2-dirs: @dirrm share/gnome/help
416@dirrm share/gedit-2/ui 416@dirrm share/gedit-2/ui
417@dirrm share/gedit-2/taglist 417@dirrm share/gedit-2/taglist
418@dirrm share/gedit-2/plugins/time 418@dirrm share/gedit-2/plugins/time
419@dirrm share/gedit-2/plugins/spell 419${PLIST.enchant}@dirrm share/gedit-2/plugins/spell
420@dirrm share/gedit-2/plugins/sort 420@dirrm share/gedit-2/plugins/sort
421@exec ${MKDIR} %D/share/gedit-2/plugins/sample 421@exec ${MKDIR} %D/share/gedit-2/plugins/sample
422@dirrm share/gedit-2/plugins/sample 422@dirrm share/gedit-2/plugins/sample
423@exec ${MKDIR} %D/share/gedit-2/plugins/indent 423@exec ${MKDIR} %D/share/gedit-2/plugins/indent
424@dirrm share/gedit-2/plugins/indent 424@dirrm share/gedit-2/plugins/indent
425@dirrm share/gedit-2/plugins/filebrowser 425@dirrm share/gedit-2/plugins/filebrowser
426@dirrm share/gedit-2/plugins/docinfo 426@dirrm share/gedit-2/plugins/docinfo
427@exec ${MKDIR} %D/share/gedit-2/plugins/changecase 427@exec ${MKDIR} %D/share/gedit-2/plugins/changecase
428@dirrm share/gedit-2/plugins/changecase 428@dirrm share/gedit-2/plugins/changecase
429@dirrm share/gedit-2/plugins 429@dirrm share/gedit-2/plugins
430@dirrm share/gedit-2/logo 430@dirrm share/gedit-2/logo
431@dirrm share/gedit-2/icons 431@dirrm share/gedit-2/icons
432@dirrm share/gedit-2 432@dirrm share/gedit-2

cvs diff -r1.39 -r1.40 pkgsrc/editors/gedit/distinfo (expand / switch to unified diff)

--- pkgsrc/editors/gedit/distinfo 2008/12/24 17:56:11 1.39
+++ pkgsrc/editors/gedit/distinfo 2009/01/12 21:50:17 1.40
@@ -1,7 +1,6 @@ @@ -1,7 +1,6 @@
1$NetBSD: distinfo,v 1.39 2008/12/24 17:56:11 jmcneill Exp $ 1$NetBSD: distinfo,v 1.40 2009/01/12 21:50:17 wiz Exp $
2 2
3SHA1 (gedit-2.24.2.tar.bz2) = dd47269990bcf0f1de11d3ab2cbc3e1d2b75f1d5 3SHA1 (gedit-2.24.3.tar.bz2) = 93738961fac2228dbf425009828299520d8bc06e
4RMD160 (gedit-2.24.2.tar.bz2) = 4e043a5b69c69d1edcdebc3648338d8bac4d615f 4RMD160 (gedit-2.24.3.tar.bz2) = f16efeacf7c1ad66f07c72311eb2567930876969
5Size (gedit-2.24.2.tar.bz2) = 4089534 bytes 5Size (gedit-2.24.3.tar.bz2) = 4078641 bytes
6SHA1 (patch-aa) = 6589d3e14e3210478830f7715077f67cb3556d41 6SHA1 (patch-aa) = ea4b076c14260c35298bc9a8875887b6c626a068
7SHA1 (patch-ab) = 51d328f4c84b9c8a4593891535fc3d67d060550f 

File Added: pkgsrc/editors/gedit/Attic/options.mk
# $NetBSD: options.mk,v 1.1 2009/01/12 21:50:17 wiz Exp $

PKG_OPTIONS_VAR=	PKG_OPTIONS.esound
PKG_SUPPORTED_OPTIONS=	enchant
#PKG_SUGGESTED_OPTIONS=	enchant

.include "../../mk/bsd.options.mk"

PLIST_VARS=	enchant
.if !empty(PKG_OPTIONS:Menchant)
PLIST.enchant=	yes
.include "../../textproc/enchant/buildlink3.mk"
.include "../../textproc/iso-codes/buildlink3.mk"
.else
CONFIGURE_ARGS+=       --disable-spell
.endif

cvs diff -r1.8 -r1.9 pkgsrc/editors/gedit/patches/Attic/patch-aa (expand / switch to unified diff)

--- pkgsrc/editors/gedit/patches/Attic/patch-aa 2008/09/30 08:04:30 1.8
+++ pkgsrc/editors/gedit/patches/Attic/patch-aa 2009/01/12 21:50:17 1.9
@@ -1,21 +1,21 @@ @@ -1,21 +1,21 @@
1$NetBSD: patch-aa,v 1.8 2008/09/30 08:04:30 hubertf Exp $ 1$NetBSD: patch-aa,v 1.9 2009/01/12 21:50:17 wiz Exp $
2 2
3--- plugins/taglist/Makefile.in.orig 2008-09-19 04:57:38.000000000 +0200 3--- plugins/taglist/Makefile.in.orig 2009-01-10 18:45:20.000000000 +0100
4+++ plugins/taglist/Makefile.in 4+++ plugins/taglist/Makefile.in
5@@ -138,6 +138,7 @@ GMSGFMT = @GMSGFMT@ 5@@ -142,6 +142,7 @@ GMSGFMT = @GMSGFMT@
6 GREP = @GREP@ 6 GREP = @GREP@
7 GTKDOC_CHECK = @GTKDOC_CHECK@ 7 GTKDOC_CHECK = @GTKDOC_CHECK@
8 GZIP = @GZIP@ 8 GZIP = @GZIP@
9+GZIP_ENV = --best 9+GZIP_ENV = --best
10 HELP_DIR = @HELP_DIR@ 10 HELP_DIR = @HELP_DIR@
11 HTML_DIR = @HTML_DIR@ 11 HTML_DIR = @HTML_DIR@
12 INSTALL = @INSTALL@ 12 INSTALL = @INSTALL@
13@@ -650,7 +651,7 @@ uninstall-am: uninstall-pluginDATA unins 13@@ -637,7 +638,7 @@ uninstall-am: uninstall-pluginDATA unins
14  14
15 %.tags.gz: %.tags.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) 15 %.tags.gz: %.tags.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po)
16 LC_ALL=C $(INTLTOOL_MERGE) $(top_srcdir)/po $< $(@:.gz=) -x -u -c $(top_builddir)/po/.intltool-merge-cache 16 LC_ALL=C $(INTLTOOL_MERGE) $(top_srcdir)/po $< $(@:.gz=) -x -u -c $(top_builddir)/po/.intltool-merge-cache
17- $(GZIP) --best -f $(@:.gz=) 17- $(GZIP) --best -f $(@:.gz=)
18+ env GZIP=$(GZIP_ENV) $(GZIP) -f $(@:.gz=) 18+ env GZIP=$(GZIP_ENV) $(GZIP) -f $(@:.gz=)
19 # Tell versions [3.59,3.63) of GNU make to not export all variables. 19 # Tell versions [3.59,3.63) of GNU make to not export all variables.
20 # Otherwise a system limit (for SysV at least) may be exceeded. 20 # Otherwise a system limit (for SysV at least) may be exceeded.
21 .NOEXPORT: 21 .NOEXPORT:

File Deleted: pkgsrc/editors/gedit/patches/Attic/patch-ab