Re: pkg/44017: gedit python support should be added as an option

To: pkg-manager%netbsd.org@localhost,gnats-admin%netbsd.org@localhost,pkgsrc-bugs%netbsd.org@localhost,mm_lists%pulsar-zone.net@localhost
Subject: Re: pkg/44017: gedit python support should be added as an option
From: Matthew Mondor <mm_lists%pulsar-zone.net@localhost>
Date: Mon, 1 Nov 2010 21:00:07 +0000 (UTC)
The following reply was made to PR pkg/44017; it has been noted by GNATS.

From: Matthew Mondor <mm_lists%pulsar-zone.net@localhost>
To: gnats-bugs%NetBSD.org@localhost
Cc: 
Subject: Re: pkg/44017: gedit python support should be added as an option
Date: Mon, 1 Nov 2010 16:57:29 -0400

 --MP_/J94N2TF=aLhbBje/.dadpOu
 Content-Type: text/plain; charset=US-ASCII
 Content-Transfer-Encoding: 7bit
 Content-Disposition: inline
 
 I have a set of changes which appear to work.  More testing welcome
 (not being a gedit user myself, I'm not very familiar with it).
 
 Note that these changes are against pkgsrc-2010Q2, although the two
 modified packages appeared to still be the same on -current pkgsrc.
 
 - First copy py-gtksourceview-buildlink3.txt
   to /usr/pkgsrc/x11/py-gtksourceview/buildlink3.mk
 - Then copy gedit-patch-aa.txt to
   /usr/pkgsrc/editors/gedit/patches/patch-aa
 - Apply the gedit-diff.txt patch as follows:
   cd /usr/pkgsrc/editors/gedit/ && patch </path/to/gedit-diff.txt
 - Enable the python option for gedit:
   echo 'PKG_OPTIONS.gedit+=python' >>/etc/mk.conf
 - Finally build the package as usual:
   cd /usr/pkgsrc/editors/gedit/ && make install
 
 For convenience, I have archived already updated copies of the pkgsrc
 stubs for py-gtksourceview and gedit at:
 http://ftp.pulsar-zone.net/pkgsrc/editors-gedit-python.tgz
 http://ftp.pulsar-zone.net/pkgsrc/x11-py-gtksourceview.tgz
 
 Thanks,
 -- 
 Matt
 
 --MP_/J94N2TF=aLhbBje/.dadpOu
 Content-Type: text/plain
 Content-Transfer-Encoding: 7bit
 Content-Disposition: attachment; filename=py-gtksourceview-buildlink3.txt
 
 # $NetBSD$
 
 BUILDLINK_TREE+=       pygtksourceview
 
 .if !defined(PY_GTKSOURCEVIEW_BUILDLINK3_MK)
 PY_GTKSOURCEVIEW_BUILDLINK3_MK:=
 
 .include "../../lang/python/pyversion.mk"
 
 BUILDLINK_API_DEPENDS.pygtksourceview+=        
${PYPKGPREFIX}-gtksourceview>=2.8.0nb1
 BUILDLINK_PKGSRCDIR.pygtksourceview?=  ../../x11/py-gtksourceview
 
 #.include "../../devel/py-gobject-shared/buildlink3.mk"
 #.include "../../devel/glib2/buildlink3.mk"
 .endif # PY_GOBJECT_BUILDLINK3_MK
 
 BUILDLINK_TREE+=       -pygtksourceview
 
 --MP_/J94N2TF=aLhbBje/.dadpOu
 Content-Type: text/plain
 Content-Transfer-Encoding: 7bit
 Content-Disposition: attachment; filename=gedit-patch-aa.txt
 
 $NetBSD$
 
 Add support for Python 2.6
 
 --- ./configure.orig   2010-11-01 15:17:12.000000000 -0400
 +++ ./configure        2010-11-01 15:26:32.000000000 -0400
 @@ -15072,7 +15072,7 @@
    $as_echo_n "(cached) " >&6
  else
  
 -      for am_cv_pathless_PYTHON in python python2 python3 python3.0 python2.5 
python2.4 python2.3 python2.2 python2.1 python2.0 none; do
 +      for am_cv_pathless_PYTHON in python python2 python3 python3.0 python2.6 
python2.5 python2.4 python2.3 python2.2 python2.1 python2.0 none; do
          test "$am_cv_pathless_PYTHON" = none && break
          prog="import sys
  # split strings by '.' and convert to numeric.  Append some zeros
 --- ./aclocal.m4.orig  2010-03-22 19:52:31.000000000 -0400
 +++ ./aclocal.m4       2010-11-01 15:28:36.000000000 -0400
 @@ -1623,7 +1623,7 @@
    dnl Find a Python interpreter.  Python versions prior to 2.0 are not
    dnl supported. (2.0 was released on October 16, 2000).
    m4_define_default([_AM_PYTHON_INTERPRETER_LIST],
 -                    [python python2 python3 python3.0 python2.5 python2.4 
python2.3 python2.2 dnl
 +                    [python python2 python3 python3.0 python2.6 python2.5 
python2.4 python2.3 python2.2 dnl
  python2.1 python2.0])
  
    m4_if([$1],[],[
 
 --MP_/J94N2TF=aLhbBje/.dadpOu
 Content-Type: text/plain
 Content-Transfer-Encoding: 7bit
 Content-Disposition: attachment; filename=gedit-diff.txt
 
 Index: PLIST
 ===================================================================
 RCS file: /nfs/ginseng/home/data/cvsup/netbsd/pkgsrc/editors/gedit/PLIST,v
 retrieving revision 1.41
 diff -u -r1.41 PLIST
 --- PLIST      15 Nov 2009 21:18:07 -0000      1.41
 +++ PLIST      1 Nov 2010 20:16:12 -0000
 @@ -413,5 +413,126 @@
  share/omf/gedit/gedit-zh_CN.omf
  share/omf/gedit/gedit-zh_HK.omf
  share/omf/gedit/gedit-zh_TW.omf
 +${PLIST.python}lib/gedit-2/plugin-loaders/libpythonloader.a
 +${PLIST.python}lib/gedit-2/plugin-loaders/libpythonloader.la
 +${PLIST.python}lib/gedit-2/plugin-loaders/libpythonloader.so
 +${PLIST.python}lib/gedit-2/plugins/externaltools.gedit-plugin
 +${PLIST.python}lib/gedit-2/plugins/externaltools/ElementTree.py
 +${PLIST.python}lib/gedit-2/plugins/externaltools/ElementTree.pyc
 +${PLIST.python}lib/gedit-2/plugins/externaltools/ElementTree.pyo
 +${PLIST.python}lib/gedit-2/plugins/externaltools/__init__.py
 +${PLIST.python}lib/gedit-2/plugins/externaltools/__init__.pyc
 +${PLIST.python}lib/gedit-2/plugins/externaltools/__init__.pyo
 +${PLIST.python}lib/gedit-2/plugins/externaltools/capture.py
 +${PLIST.python}lib/gedit-2/plugins/externaltools/capture.pyc
 +${PLIST.python}lib/gedit-2/plugins/externaltools/capture.pyo
 +${PLIST.python}lib/gedit-2/plugins/externaltools/functions.py
 +${PLIST.python}lib/gedit-2/plugins/externaltools/functions.pyc
 +${PLIST.python}lib/gedit-2/plugins/externaltools/functions.pyo
 +${PLIST.python}lib/gedit-2/plugins/externaltools/library.py
 +${PLIST.python}lib/gedit-2/plugins/externaltools/library.pyc
 +${PLIST.python}lib/gedit-2/plugins/externaltools/library.pyo
 +${PLIST.python}lib/gedit-2/plugins/externaltools/manager.py
 +${PLIST.python}lib/gedit-2/plugins/externaltools/manager.pyc
 +${PLIST.python}lib/gedit-2/plugins/externaltools/manager.pyo
 +${PLIST.python}lib/gedit-2/plugins/externaltools/outputpanel.py
 +${PLIST.python}lib/gedit-2/plugins/externaltools/outputpanel.pyc
 +${PLIST.python}lib/gedit-2/plugins/externaltools/outputpanel.pyo
 +${PLIST.python}lib/gedit-2/plugins/pythonconsole.gedit-plugin
 +${PLIST.python}lib/gedit-2/plugins/pythonconsole/__init__.py
 +${PLIST.python}lib/gedit-2/plugins/pythonconsole/__init__.pyc
 +${PLIST.python}lib/gedit-2/plugins/pythonconsole/__init__.pyo
 +${PLIST.python}lib/gedit-2/plugins/pythonconsole/config.py
 +${PLIST.python}lib/gedit-2/plugins/pythonconsole/config.pyc
 +${PLIST.python}lib/gedit-2/plugins/pythonconsole/config.pyo
 +${PLIST.python}lib/gedit-2/plugins/pythonconsole/console.py
 +${PLIST.python}lib/gedit-2/plugins/pythonconsole/console.pyc
 +${PLIST.python}lib/gedit-2/plugins/pythonconsole/console.pyo
 +${PLIST.python}lib/gedit-2/plugins/quickopen.gedit-plugin
 +${PLIST.python}lib/gedit-2/plugins/quickopen/__init__.py
 +${PLIST.python}lib/gedit-2/plugins/quickopen/__init__.pyc
 +${PLIST.python}lib/gedit-2/plugins/quickopen/__init__.pyo
 +${PLIST.python}lib/gedit-2/plugins/quickopen/popup.py
 +${PLIST.python}lib/gedit-2/plugins/quickopen/popup.pyc
 +${PLIST.python}lib/gedit-2/plugins/quickopen/popup.pyo
 +${PLIST.python}lib/gedit-2/plugins/quickopen/virtualdirs.py
 +${PLIST.python}lib/gedit-2/plugins/quickopen/virtualdirs.pyc
 +${PLIST.python}lib/gedit-2/plugins/quickopen/virtualdirs.pyo
 +${PLIST.python}lib/gedit-2/plugins/quickopen/windowhelper.py
 +${PLIST.python}lib/gedit-2/plugins/quickopen/windowhelper.pyc
 +${PLIST.python}lib/gedit-2/plugins/quickopen/windowhelper.pyo
 +${PLIST.python}lib/gedit-2/plugins/snippets.gedit-plugin
 +${PLIST.python}lib/gedit-2/plugins/snippets/Document.py
 +${PLIST.python}lib/gedit-2/plugins/snippets/Document.pyc
 +${PLIST.python}lib/gedit-2/plugins/snippets/Document.pyo
 +${PLIST.python}lib/gedit-2/plugins/snippets/ElementTree.py
 +${PLIST.python}lib/gedit-2/plugins/snippets/ElementTree.pyc
 +${PLIST.python}lib/gedit-2/plugins/snippets/ElementTree.pyo
 +${PLIST.python}lib/gedit-2/plugins/snippets/Exporter.py
 +${PLIST.python}lib/gedit-2/plugins/snippets/Exporter.pyc
 +${PLIST.python}lib/gedit-2/plugins/snippets/Exporter.pyo
 +${PLIST.python}lib/gedit-2/plugins/snippets/Helper.py
 +${PLIST.python}lib/gedit-2/plugins/snippets/Helper.pyc
 +${PLIST.python}lib/gedit-2/plugins/snippets/Helper.pyo
 +${PLIST.python}lib/gedit-2/plugins/snippets/Importer.py
 +${PLIST.python}lib/gedit-2/plugins/snippets/Importer.pyc
 +${PLIST.python}lib/gedit-2/plugins/snippets/Importer.pyo
 +${PLIST.python}lib/gedit-2/plugins/snippets/Library.py
 +${PLIST.python}lib/gedit-2/plugins/snippets/Library.pyc
 +${PLIST.python}lib/gedit-2/plugins/snippets/Library.pyo
 +${PLIST.python}lib/gedit-2/plugins/snippets/Manager.py
 +${PLIST.python}lib/gedit-2/plugins/snippets/Manager.pyc
 +${PLIST.python}lib/gedit-2/plugins/snippets/Manager.pyo
 +${PLIST.python}lib/gedit-2/plugins/snippets/Parser.py
 +${PLIST.python}lib/gedit-2/plugins/snippets/Parser.pyc
 +${PLIST.python}lib/gedit-2/plugins/snippets/Parser.pyo
 +${PLIST.python}lib/gedit-2/plugins/snippets/Placeholder.py
 +${PLIST.python}lib/gedit-2/plugins/snippets/Placeholder.pyc
 +${PLIST.python}lib/gedit-2/plugins/snippets/Placeholder.pyo
 +${PLIST.python}lib/gedit-2/plugins/snippets/Snippet.py
 +${PLIST.python}lib/gedit-2/plugins/snippets/Snippet.pyc
 +${PLIST.python}lib/gedit-2/plugins/snippets/Snippet.pyo
 +${PLIST.python}lib/gedit-2/plugins/snippets/SnippetComplete.py
 +${PLIST.python}lib/gedit-2/plugins/snippets/SnippetComplete.pyc
 +${PLIST.python}lib/gedit-2/plugins/snippets/SnippetComplete.pyo
 +${PLIST.python}lib/gedit-2/plugins/snippets/SubstitutionParser.py
 +${PLIST.python}lib/gedit-2/plugins/snippets/SubstitutionParser.pyc
 +${PLIST.python}lib/gedit-2/plugins/snippets/SubstitutionParser.pyo
 +${PLIST.python}lib/gedit-2/plugins/snippets/WindowHelper.py
 +${PLIST.python}lib/gedit-2/plugins/snippets/WindowHelper.pyc
 +${PLIST.python}lib/gedit-2/plugins/snippets/WindowHelper.pyo
 +${PLIST.python}lib/gedit-2/plugins/snippets/__init__.py
 +${PLIST.python}lib/gedit-2/plugins/snippets/__init__.pyc
 +${PLIST.python}lib/gedit-2/plugins/snippets/__init__.pyo
 +${PLIST.python}share/gedit-2/plugins/externaltools/tools/build
 +${PLIST.python}share/gedit-2/plugins/externaltools/tools/open-terminal-here
 
+${PLIST.python}share/gedit-2/plugins/externaltools/tools/remove-trailing-spaces
 +${PLIST.python}share/gedit-2/plugins/externaltools/tools/run-command
 +${PLIST.python}share/gedit-2/plugins/externaltools/ui/outputpanel.ui
 +${PLIST.python}share/gedit-2/plugins/externaltools/ui/tools.ui
 +${PLIST.python}share/gedit-2/plugins/pythonconsole/ui/config.ui
 +${PLIST.python}share/gedit-2/plugins/snippets/c.xml
 +${PLIST.python}share/gedit-2/plugins/snippets/chdr.xml
 +${PLIST.python}share/gedit-2/plugins/snippets/cpp.xml
 +${PLIST.python}share/gedit-2/plugins/snippets/css.xml
 +${PLIST.python}share/gedit-2/plugins/snippets/docbook.xml
 +${PLIST.python}share/gedit-2/plugins/snippets/fortran.xml
 +${PLIST.python}share/gedit-2/plugins/snippets/global.xml
 +${PLIST.python}share/gedit-2/plugins/snippets/haskell.xml
 +${PLIST.python}share/gedit-2/plugins/snippets/html.xml
 +${PLIST.python}share/gedit-2/plugins/snippets/idl.xml
 +${PLIST.python}share/gedit-2/plugins/snippets/java.xml
 +${PLIST.python}share/gedit-2/plugins/snippets/javascript.xml
 +${PLIST.python}share/gedit-2/plugins/snippets/lang/snippets.lang
 +${PLIST.python}share/gedit-2/plugins/snippets/latex.xml
 +${PLIST.python}share/gedit-2/plugins/snippets/perl.xml
 +${PLIST.python}share/gedit-2/plugins/snippets/php.xml
 +${PLIST.python}share/gedit-2/plugins/snippets/python.xml
 +${PLIST.python}share/gedit-2/plugins/snippets/ruby.xml
 +${PLIST.python}share/gedit-2/plugins/snippets/sh.xml
 +${PLIST.python}share/gedit-2/plugins/snippets/snippets.xml
 +${PLIST.python}share/gedit-2/plugins/snippets/tcl.xml
 +${PLIST.python}share/gedit-2/plugins/snippets/ui/snippets.ui
 +${PLIST.python}share/gedit-2/plugins/snippets/xml.xml
  @pkgdir share/gedit-2/plugins/indent
  @pkgdir share/gedit-2/plugins/changecase
 Index: distinfo
 ===================================================================
 RCS file: /nfs/ginseng/home/data/cvsup/netbsd/pkgsrc/editors/gedit/distinfo,v
 retrieving revision 1.49
 diff -u -r1.49 distinfo
 --- distinfo   13 Apr 2010 16:52:39 -0000      1.49
 +++ distinfo   1 Nov 2010 19:31:30 -0000
 @@ -3,4 +3,5 @@
  SHA1 (gedit-2.28.4.tar.bz2) = 5f28f25c8b86cc8a5ba875121124099b94681d48
  RMD160 (gedit-2.28.4.tar.bz2) = 3bd518f8e91d04fcb6b7e06e59f27185a735aded
  Size (gedit-2.28.4.tar.bz2) = 4597928 bytes
 +SHA1 (patch-aa) = 6cdf6353b1eeb9f05acf3fc5a39586bc0a0d09ea
  SHA1 (patch-ab) = 06f1492437126f8ee12bda5b5dd090b713885ba2
 Index: options.mk
 ===================================================================
 RCS file: /nfs/ginseng/home/data/cvsup/netbsd/pkgsrc/editors/gedit/options.mk,v
 retrieving revision 1.2
 diff -u -r1.2 options.mk
 --- options.mk 17 Apr 2009 18:40:42 -0000      1.2
 +++ options.mk 1 Nov 2010 19:51:12 -0000
 @@ -1,12 +1,12 @@
  # $NetBSD: options.mk,v 1.2 2009/04/17 18:40:42 drochner Exp $
  
  PKG_OPTIONS_VAR=      PKG_OPTIONS.gedit
 -PKG_SUPPORTED_OPTIONS=        enchant
 +PKG_SUPPORTED_OPTIONS=        enchant python
  #PKG_SUGGESTED_OPTIONS=       enchant
  
  .include "../../mk/bsd.options.mk"
  
 -PLIST_VARS=   enchant
 +PLIST_VARS=   enchant python
  .if !empty(PKG_OPTIONS:Menchant)
  PLIST.enchant=        yes
  .include "../../textproc/enchant/buildlink3.mk"
 @@ -14,3 +14,19 @@
  .else
  CONFIGURE_ARGS+=       --disable-spell
  .endif
 +
 +.if !empty(PKG_OPTIONS:Mpython)
 +PLIST.python= yes
 +SUBST_CLASSES+=               python
 +SUBST_MESSAGE.python= Fix python path for test case.
 +SUBST_STAGE.python=   post-extract
 +SUBST_FILES.python+=  Makefile
 +SUBST_SED.python+=    -e 's,=python,=${PYTHONBIN},'
 +.include "../../lang/python26/buildlink3.mk"
 +.include "../../devel/py-gobject/buildlink3.mk"
 +.include "../../x11/py-gtk2/buildlink3.mk"
 +.include "../../x11/py-gtksourceview/buildlink3.mk"
 +CONFIGURE_ARGS+= --enable-python
 +.else
 +CONFIGURE_ARGS+= --disable-python
 +.endif
 
 --MP_/J94N2TF=aLhbBje/.dadpOu--
Prev by Date: Re: pkg/43995: security/gnutls failed to compile with error "-lreadline not found", though it was installed
Next by Date: pkg/44024: mail/heirloom-mailx fails to build with recent openssl
Previous by Thread: pkg/44017: gedit python support should be added as an option
Next by Thread: Re: pkg/44017: gedit python support should be added as an option
Indexes:
Home | Main Index | Thread Index | Old Index