From 0132a83cb716942cb0c428f36b5054176372c89d Mon Sep 17 00:00:00 2001 From: jasper Date: Sat, 30 Mar 2013 13:04:46 +0000 Subject: [PATCH] - update to gedit-plugins-3.8.0 * disable python support for now, untill we can use python3 here. --- x11/gnome/gedit-plugins/Makefile | 33 +-- x11/gnome/gedit-plugins/distinfo | 4 +- .../gedit-plugins/patches/patch-configure | 18 +- x11/gnome/gedit-plugins/pkg/PLIST | 206 +----------------- 4 files changed, 35 insertions(+), 226 deletions(-) diff --git a/x11/gnome/gedit-plugins/Makefile b/x11/gnome/gedit-plugins/Makefile index b42f1bc2d7f..284e202fe2d 100644 --- a/x11/gnome/gedit-plugins/Makefile +++ b/x11/gnome/gedit-plugins/Makefile @@ -1,9 +1,9 @@ -# $OpenBSD: Makefile,v 1.54 2013/03/11 11:46:10 espie Exp $ +# $OpenBSD: Makefile,v 1.55 2013/03/30 13:04:46 jasper Exp $ COMMENT= plugins for Gedit GNOME_PROJECT= gedit-plugins -GNOME_VERSION= 3.6.1 +GNOME_VERSION= 3.8.0 CATEGORIES= editors @@ -12,28 +12,28 @@ HOMEPAGE= http://live.gnome.org/Gedit/Plugins # GPLv2 PERMIT_PACKAGE_CDROM= Yes -WANTLIB += GL X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes -WANTLIB += Xi Xinerama Xrandr Xrender Xxf86vm atk-1.0 cairo cairo-gobject -WANTLIB += drm expat ffi fontconfig freetype gdk-3 gdk_pixbuf-2.0 -WANTLIB += gio-2.0 girepository-1.0 glib-2.0 gmodule-2.0 gobject-2.0 -WANTLIB += gthread-2.0 gtk-3 gtksourceview-3.0 m pango-1.0 pangocairo-1.0 -WANTLIB += pangoft2-1.0 pcre peas-1.0 peas-gtk-1.0 pixman-1 png -WANTLIB += pthread-stubs xcb xcb-render xcb-shm xml2 z stdc++ -WANTLIB += ICE SM atk-bridge-2.0 atspi dbus-1 harfbuzz icudata -WANTLIB += icule icuuc pthread +WANTLIB += ICE SM X11 Xcomposite Xcursor Xdamage Xext Xfixes Xi +WANTLIB += Xinerama Xrandr Xrender atk-1.0 atk-bridge-2.0 atspi +WANTLIB += cairo cairo-gobject dbus-1 expat ffi fontconfig freetype +WANTLIB += gdk-3 gdk_pixbuf-2.0 gio-2.0 girepository-1.0 glib-2.0 +WANTLIB += gmodule-2.0 gobject-2.0 graphite2 gthread-2.0 gtk-3 +WANTLIB += gtksourceview-3.0 harfbuzz icudata icule icuuc m pango-1.0 +WANTLIB += pangocairo-1.0 pangoft2-1.0 pcre peas-1.0 peas-gtk-1.0 +WANTLIB += pixman-1 png pthread pthread-stubs xcb xcb-render xcb-shm +WANTLIB += xml2 z MODULES= devel/gettext \ lang/python \ x11/gnome BUILD_DEPENDS= ${RUN_DEPENDS} \ - devel/gsettings-desktop-schemas -LIB_DEPENDS= devel/libpeas>=1.1.4p1 \ + devel/gsettings-desktop-schemas \ + textproc/gsed +LIB_DEPENDS= devel/libpeas>=1.8.0 \ x11/gtksourceview3 RUN_DEPENDS= devel/gsettings-desktop-schemas \ devel/vte3 \ - x11/dbus-python \ - x11/gnome/gedit>=3.4.0 \ + x11/gnome/gedit>=3.8.0 \ x11/gnome/gucharmap LIBTOOL_FLAGS= --tag=disable-static @@ -41,6 +41,9 @@ LIBTOOL_FLAGS= --tag=disable-static CONFIGURE_ARGS+= --disable-static \ --with-plugins=all +# XXX: Re-enable for py-gobject with python 3 +CONFIGURE_ARGS+= --disable-python + # needed for the Vte plugin (-lvte2_90) MODGNOME_CPPFLAGS= -I${X11BASE}/include -pthread MODGNOME_LDFLAGS= -L${X11BASE}/lib -pthread diff --git a/x11/gnome/gedit-plugins/distinfo b/x11/gnome/gedit-plugins/distinfo index dec42a9b0f0..242b4caeb00 100644 --- a/x11/gnome/gedit-plugins/distinfo +++ b/x11/gnome/gedit-plugins/distinfo @@ -1,2 +1,2 @@ -SHA256 (gnome/gedit-plugins-3.6.1.tar.xz) = xekoMOYCkRC/ERe9nzGyOprZByELjLNwOXcvW/z20XQ= -SIZE (gnome/gedit-plugins-3.6.1.tar.xz) = 1402568 +SHA256 (gnome/gedit-plugins-3.8.0.tar.xz) = ROjWGuY0iYvzqGvotrL9T5mPhdz2y5LsgKUIyiRc5rU= +SIZE (gnome/gedit-plugins-3.8.0.tar.xz) = 722464 diff --git a/x11/gnome/gedit-plugins/patches/patch-configure b/x11/gnome/gedit-plugins/patches/patch-configure index 5039164fd3d..a12b15c8774 100644 --- a/x11/gnome/gedit-plugins/patches/patch-configure +++ b/x11/gnome/gedit-plugins/patches/patch-configure @@ -1,10 +1,11 @@ -$OpenBSD: patch-configure,v 1.8 2012/10/16 17:58:42 jasper Exp $ +$OpenBSD: patch-configure,v 1.9 2013/03/30 13:04:46 jasper Exp $ Fix DATADIRNAME: see LOCALBASE/share/aclocal/{glib-gettext.m4,intltool.m4} +Fix some sed (mis)usage. ---- configure.orig Tue Oct 16 16:23:55 2012 -+++ configure Tue Oct 16 19:53:59 2012 -@@ -12384,6 +12384,9 @@ else +--- configure.orig Mon Mar 25 20:57:20 2013 ++++ configure Sat Mar 30 13:33:25 2013 +@@ -12456,6 +12456,9 @@ else fi ;; @@ -14,3 +15,12 @@ Fix DATADIRNAME: see LOCALBASE/share/aclocal/{glib-gettext.m4,intltool.m4} *) DATADIRNAME=lib ;; +@@ -15036,7 +15039,7 @@ undef_plugin() { + disabled_plugins="$disabled_plugins, $1 ($2)" + fi + +- PLUGINS=$(echo "$PLUGINS" | sed -e "s/[^a-zA-Z0-9_]$1[ \t\r\n\f]\{1,\}/ /" -e "s/[^a-zA-Z0-9_]$1$//" -e "s/^$1[ \t\r\n\f]\{1,\}//") ++ PLUGINS=$(echo "$PLUGINS" | gsed -e "s/[^a-zA-Z0-9_]$1[ \t\r\n\f]\{1,\}/ /" -e "s/[^a-zA-Z0-9_]$1$//" -e "s/^$1[ \t\r\n\f]\{1,\}//") + } + + # ================================================================ diff --git a/x11/gnome/gedit-plugins/pkg/PLIST b/x11/gnome/gedit-plugins/pkg/PLIST index b67fe6d9bba..aa76a4a1bd0 100644 --- a/x11/gnome/gedit-plugins/pkg/PLIST +++ b/x11/gnome/gedit-plugins/pkg/PLIST @@ -1,218 +1,14 @@ -@comment $OpenBSD: PLIST,v 1.13 2012/09/29 10:10:46 ajacoutot Exp $ +@comment $OpenBSD: PLIST,v 1.14 2013/03/30 13:04:46 jasper Exp $ lib/gedit/plugins/bookmarks.plugin -lib/gedit/plugins/bracketcompletion.plugin -lib/gedit/plugins/bracketcompletion.py -lib/gedit/plugins/bracketcompletion.pyc -lib/gedit/plugins/bracketcompletion.pyo -lib/gedit/plugins/charmap/ -lib/gedit/plugins/charmap.plugin -lib/gedit/plugins/charmap/__init__.py -lib/gedit/plugins/charmap/__init__.pyc -lib/gedit/plugins/charmap/__init__.pyo -lib/gedit/plugins/charmap/panel.py -lib/gedit/plugins/charmap/panel.pyc -lib/gedit/plugins/charmap/panel.pyo -lib/gedit/plugins/codecomment.plugin -lib/gedit/plugins/codecomment.py -lib/gedit/plugins/codecomment.pyc -lib/gedit/plugins/codecomment.pyo -lib/gedit/plugins/colorpicker.plugin -lib/gedit/plugins/colorpicker.py -lib/gedit/plugins/colorpicker.pyc -lib/gedit/plugins/colorpicker.pyo -lib/gedit/plugins/commander/ -lib/gedit/plugins/commander.plugin -lib/gedit/plugins/commander/__init__.py -lib/gedit/plugins/commander/__init__.pyc -lib/gedit/plugins/commander/__init__.pyo -lib/gedit/plugins/commander/commands/ -lib/gedit/plugins/commander/commands/__init__.py -lib/gedit/plugins/commander/commands/__init__.pyc -lib/gedit/plugins/commander/commands/__init__.pyo -lib/gedit/plugins/commander/commands/accel_group.py -lib/gedit/plugins/commander/commands/accel_group.pyc -lib/gedit/plugins/commander/commands/accel_group.pyo -lib/gedit/plugins/commander/commands/completion.py -lib/gedit/plugins/commander/commands/completion.pyc -lib/gedit/plugins/commander/commands/completion.pyo -lib/gedit/plugins/commander/commands/exceptions.py -lib/gedit/plugins/commander/commands/exceptions.pyc -lib/gedit/plugins/commander/commands/exceptions.pyo -lib/gedit/plugins/commander/commands/metamodule.py -lib/gedit/plugins/commander/commands/metamodule.pyc -lib/gedit/plugins/commander/commands/metamodule.pyo -lib/gedit/plugins/commander/commands/method.py -lib/gedit/plugins/commander/commands/method.pyc -lib/gedit/plugins/commander/commands/method.pyo -lib/gedit/plugins/commander/commands/module.py -lib/gedit/plugins/commander/commands/module.pyc -lib/gedit/plugins/commander/commands/module.pyo -lib/gedit/plugins/commander/commands/result.py -lib/gedit/plugins/commander/commands/result.pyc -lib/gedit/plugins/commander/commands/result.pyo -lib/gedit/plugins/commander/commands/rollbackimporter.py -lib/gedit/plugins/commander/commands/rollbackimporter.pyc -lib/gedit/plugins/commander/commands/rollbackimporter.pyo -lib/gedit/plugins/commander/entry.py -lib/gedit/plugins/commander/entry.pyc -lib/gedit/plugins/commander/entry.pyo -lib/gedit/plugins/commander/history.py -lib/gedit/plugins/commander/history.pyc -lib/gedit/plugins/commander/history.pyo -lib/gedit/plugins/commander/info.py -lib/gedit/plugins/commander/info.pyc -lib/gedit/plugins/commander/info.pyo -lib/gedit/plugins/commander/modules.py -lib/gedit/plugins/commander/modules.pyc -lib/gedit/plugins/commander/modules.pyo -lib/gedit/plugins/commander/transparentwindow.py -lib/gedit/plugins/commander/transparentwindow.pyc -lib/gedit/plugins/commander/transparentwindow.pyo -lib/gedit/plugins/commander/utils.py -lib/gedit/plugins/commander/utils.pyc -lib/gedit/plugins/commander/utils.pyo -lib/gedit/plugins/commander/windowactivatable.py -lib/gedit/plugins/commander/windowactivatable.pyc -lib/gedit/plugins/commander/windowactivatable.pyo -lib/gedit/plugins/dashboard/ -lib/gedit/plugins/dashboard.plugin -lib/gedit/plugins/dashboard/__init__.py -lib/gedit/plugins/dashboard/__init__.pyc -lib/gedit/plugins/dashboard/__init__.pyo -lib/gedit/plugins/dashboard/dashboard.py -lib/gedit/plugins/dashboard/dashboard.pyc -lib/gedit/plugins/dashboard/dashboard.pyo -lib/gedit/plugins/dashboard/utils.py -lib/gedit/plugins/dashboard/utils.pyc -lib/gedit/plugins/dashboard/utils.pyo lib/gedit/plugins/drawspaces.plugin lib/gedit/plugins/gpdefs.py lib/gedit/plugins/gpdefs.pyc lib/gedit/plugins/gpdefs.pyo -lib/gedit/plugins/joinlines.plugin -lib/gedit/plugins/joinlines.py -lib/gedit/plugins/joinlines.pyc -lib/gedit/plugins/joinlines.pyo lib/gedit/plugins/libbookmarks.so lib/gedit/plugins/libdrawspaces.so -lib/gedit/plugins/libtaglist.so lib/gedit/plugins/libwordcompletion.so -lib/gedit/plugins/multiedit/ -lib/gedit/plugins/multiedit.plugin -lib/gedit/plugins/multiedit/__init__.py -lib/gedit/plugins/multiedit/__init__.pyc -lib/gedit/plugins/multiedit/__init__.pyo -lib/gedit/plugins/multiedit/documenthelper.py -lib/gedit/plugins/multiedit/documenthelper.pyc -lib/gedit/plugins/multiedit/documenthelper.pyo -lib/gedit/plugins/multiedit/signals.py -lib/gedit/plugins/multiedit/signals.pyc -lib/gedit/plugins/multiedit/signals.pyo -lib/gedit/plugins/sessionsaver/ -lib/gedit/plugins/sessionsaver.plugin -lib/gedit/plugins/sessionsaver/__init__.py -lib/gedit/plugins/sessionsaver/__init__.pyc -lib/gedit/plugins/sessionsaver/__init__.pyo -lib/gedit/plugins/sessionsaver/dialogs.py -lib/gedit/plugins/sessionsaver/dialogs.pyc -lib/gedit/plugins/sessionsaver/dialogs.pyo -lib/gedit/plugins/sessionsaver/store.py -lib/gedit/plugins/sessionsaver/store.pyc -lib/gedit/plugins/sessionsaver/store.pyo -lib/gedit/plugins/smartspaces.plugin -lib/gedit/plugins/smartspaces.py -lib/gedit/plugins/smartspaces.pyc -lib/gedit/plugins/smartspaces.pyo -lib/gedit/plugins/synctex/ -lib/gedit/plugins/synctex.plugin -lib/gedit/plugins/synctex/__init__.py -lib/gedit/plugins/synctex/__init__.pyc -lib/gedit/plugins/synctex/__init__.pyo -lib/gedit/plugins/synctex/evince_dbus.py -lib/gedit/plugins/synctex/evince_dbus.pyc -lib/gedit/plugins/synctex/evince_dbus.pyo -lib/gedit/plugins/synctex/synctex.py -lib/gedit/plugins/synctex/synctex.pyc -lib/gedit/plugins/synctex/synctex.pyo -lib/gedit/plugins/taglist.plugin -lib/gedit/plugins/terminal.plugin -lib/gedit/plugins/terminal.py -lib/gedit/plugins/terminal.pyc -lib/gedit/plugins/terminal.pyo -lib/gedit/plugins/textsize/ -lib/gedit/plugins/textsize.plugin -lib/gedit/plugins/textsize/__init__.py -lib/gedit/plugins/textsize/__init__.pyc -lib/gedit/plugins/textsize/__init__.pyo -lib/gedit/plugins/textsize/documenthelper.py -lib/gedit/plugins/textsize/documenthelper.pyc -lib/gedit/plugins/textsize/documenthelper.pyo -lib/gedit/plugins/textsize/signals.py -lib/gedit/plugins/textsize/signals.pyc -lib/gedit/plugins/textsize/signals.pyo lib/gedit/plugins/wordcompletion.plugin -share/gedit/plugins/bookmarks/ -share/gedit/plugins/bookmarks/bookmark.png -share/gedit/plugins/commander/ -share/gedit/plugins/commander/modules/ -share/gedit/plugins/commander/modules/align.py -share/gedit/plugins/commander/modules/align.pyc -share/gedit/plugins/commander/modules/align.pyo -share/gedit/plugins/commander/modules/bookmark.py -share/gedit/plugins/commander/modules/bookmark.pyc -share/gedit/plugins/commander/modules/bookmark.pyo -share/gedit/plugins/commander/modules/doc.py -share/gedit/plugins/commander/modules/doc.pyc -share/gedit/plugins/commander/modules/doc.pyo -share/gedit/plugins/commander/modules/edit.py -share/gedit/plugins/commander/modules/edit.pyc -share/gedit/plugins/commander/modules/edit.pyo -share/gedit/plugins/commander/modules/find/ -share/gedit/plugins/commander/modules/find/__init__.py -share/gedit/plugins/commander/modules/find/__init__.pyc -share/gedit/plugins/commander/modules/find/__init__.pyo -share/gedit/plugins/commander/modules/find/finder.py -share/gedit/plugins/commander/modules/find/finder.pyc -share/gedit/plugins/commander/modules/find/finder.pyo -share/gedit/plugins/commander/modules/find/regex.py -share/gedit/plugins/commander/modules/find/regex.pyc -share/gedit/plugins/commander/modules/find/regex.pyo -share/gedit/plugins/commander/modules/find/test.py -share/gedit/plugins/commander/modules/find/test.pyc -share/gedit/plugins/commander/modules/find/test.pyo -share/gedit/plugins/commander/modules/format.py -share/gedit/plugins/commander/modules/format.pyc -share/gedit/plugins/commander/modules/format.pyo -share/gedit/plugins/commander/modules/goto.py -share/gedit/plugins/commander/modules/goto.pyc -share/gedit/plugins/commander/modules/goto.pyo -share/gedit/plugins/commander/modules/grep.py -share/gedit/plugins/commander/modules/grep.pyc -share/gedit/plugins/commander/modules/grep.pyo -share/gedit/plugins/commander/modules/help.py -share/gedit/plugins/commander/modules/help.pyc -share/gedit/plugins/commander/modules/help.pyo -share/gedit/plugins/commander/modules/move.py -share/gedit/plugins/commander/modules/move.pyc -share/gedit/plugins/commander/modules/move.pyo -share/gedit/plugins/commander/modules/reload.py -share/gedit/plugins/commander/modules/reload.pyc -share/gedit/plugins/commander/modules/reload.pyo -share/gedit/plugins/commander/modules/set.py -share/gedit/plugins/commander/modules/set.pyc -share/gedit/plugins/commander/modules/set.pyo -share/gedit/plugins/commander/modules/shell.py -share/gedit/plugins/commander/modules/shell.pyc -share/gedit/plugins/commander/modules/shell.pyo -share/gedit/plugins/sessionsaver/ -share/gedit/plugins/sessionsaver/sessionsaver.ui -share/gedit/plugins/taglist/ -share/gedit/plugins/taglist/HTML.tags.gz -share/gedit/plugins/taglist/Latex.tags.gz -share/gedit/plugins/taglist/XSLT.tags.gz -share/gedit/plugins/taglist/XUL.tags.gz share/glib-2.0/schemas/org.gnome.gedit.plugins.drawspaces.gschema.xml -share/glib-2.0/schemas/org.gnome.gedit.plugins.terminal.gschema.xml share/locale/af/LC_MESSAGES/gedit-plugins.mo share/locale/am/LC_MESSAGES/gedit-plugins.mo share/locale/ar/LC_MESSAGES/gedit-plugins.mo