From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1PqkSb-0002x2-Lv for garchives@archives.gentoo.org; Sat, 19 Feb 2011 10:54:55 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 164C2E05A1; Sat, 19 Feb 2011 10:54:33 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id CA16BE05A1 for ; Sat, 19 Feb 2011 10:54:32 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 3AED11B4322 for ; Sat, 19 Feb 2011 10:54:32 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 952708005E for ; Sat, 19 Feb 2011 10:54:31 +0000 (UTC) From: "Priit Laes" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Priit Laes" Message-ID: <19553913a05dee15e7fcea96de80e624cf211857.plaes@gentoo> Subject: [gentoo-commits] proj/gnome:master commit in: app-editors/gedit/, app-editors/gedit/files/ X-VCS-Repository: proj/gnome X-VCS-Files: app-editors/gedit/files/gedit-libpeas-compat.patch app-editors/gedit/gedit-2.91.6-r1.ebuild app-editors/gedit/gedit-2.91.6.ebuild app-editors/gedit/gedit-9999.ebuild X-VCS-Directories: app-editors/gedit/ app-editors/gedit/files/ X-VCS-Committer: plaes X-VCS-Committer-Name: Priit Laes X-VCS-Revision: 19553913a05dee15e7fcea96de80e624cf211857 Date: Sat, 19 Feb 2011 10:54:31 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: 7948679f7e908e17b6afa0f1657baa32 commit: 19553913a05dee15e7fcea96de80e624cf211857 Author: Priit Laes plaes org> AuthorDate: Sat Feb 19 10:38:07 2011 +0000 Commit: Priit Laes plaes org> CommitDate: Sat Feb 19 10:50:33 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/gnome.git;a=3D= commit;h=3D19553913 app-editors/gedit: Update for latest libpeas API changes --- app-editors/gedit/files/gedit-libpeas-compat.patch | 49 ++++++++++++++= ++++++ ...{gedit-2.91.6.ebuild =3D> gedit-2.91.6-r1.ebuild} | 6 ++- app-editors/gedit/gedit-9999.ebuild | 6 ++- 3 files changed, 59 insertions(+), 2 deletions(-) diff --git a/app-editors/gedit/files/gedit-libpeas-compat.patch b/app-edi= tors/gedit/files/gedit-libpeas-compat.patch new file mode 100644 index 0000000..755859c --- /dev/null +++ b/app-editors/gedit/files/gedit-libpeas-compat.patch @@ -0,0 +1,49 @@ +From 9201fe7bfe6ab36830cb0660be449b0a90d6c55e Mon Sep 17 00:00:00 2001 +From: Garrett Regier +Date: Mon, 14 Feb 2011 13:23:11 +0000 +Subject: Update to latest libpeas API changes + +--- +diff --git a/configure.ac b/configure.ac +index e7d6563..9e42175 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -307,8 +307,8 @@ PKG_CHECK_MODULES(GEDIT, [ + gio-2.0 >=3D 2.25.11 + gtk+-3.0 >=3D 2.99.0 + gtksourceview-3.0 >=3D 2.91.1 +- libpeas-1.0 >=3D 0.7.0 +- libpeas-gtk-1.0 >=3D 0.7.0 ++ libpeas-1.0 >=3D 0.7.2 ++ libpeas-gtk-1.0 >=3D 0.7.2 + gsettings-desktop-schemas + ]) +=20 +diff --git a/gedit/dialogs/gedit-preferences-dialog.c b/gedit/dialogs/ge= dit-preferences-dialog.c +index 816f73d..ec1e3f7 100644 +--- a/gedit/dialogs/gedit-preferences-dialog.c ++++ b/gedit/dialogs/gedit-preferences-dialog.c +@@ -904,7 +904,7 @@ setup_plugins_page (GeditPreferencesDialog *dlg) +=20 + gedit_debug (DEBUG_PREFS); +=20 +- page_content =3D peas_gtk_plugin_manager_new (); ++ page_content =3D peas_gtk_plugin_manager_new (NULL); + g_return_if_fail (page_content !=3D NULL); +=20 + gtk_box_pack_start (GTK_BOX (dlg->priv->plugin_manager_place_holder), +diff --git a/gedit/gedit-plugins-engine.c b/gedit/gedit-plugins-engine.c +index 807bbc2..93596f4 100644 +--- a/gedit/gedit-plugins-engine.c ++++ b/gedit/gedit-plugins-engine.c +@@ -66,6 +66,8 @@ gedit_plugins_engine_init (GeditPluginsEngine *engine) + GEDIT_TYPE_PLUGINS_ENGINE, + GeditPluginsEnginePrivate)= ; +=20 ++ peas_engine_enable_loader (PEAS_ENGINE (engine), "python"); ++ + engine->priv->plugin_settings =3D g_settings_new ("org.gnome.gedit.plu= gins"); + =09 + /* Require gedit's typelib. */ +-- +cgit v0.8.3.4 diff --git a/app-editors/gedit/gedit-2.91.6.ebuild b/app-editors/gedit/ge= dit-2.91.6-r1.ebuild similarity index 95% rename from app-editors/gedit/gedit-2.91.6.ebuild rename to app-editors/gedit/gedit-2.91.6-r1.ebuild index dcb1d87..80c4ee5 100644 --- a/app-editors/gedit/gedit-2.91.6.ebuild +++ b/app-editors/gedit/gedit-2.91.6-r1.ebuild @@ -30,7 +30,7 @@ RDEPEND=3D">=3Dx11-libs/libSM-1.0 >=3Ddev-libs/glib-2.27.92 >=3Dx11-libs/gtk+-2.99.0:3[introspection?] >=3Dx11-libs/gtksourceview-2.91.1:3.0[introspection?] - >=3Ddev-libs/libpeas-0.7.0[gtk] + >=3Ddev-libs/libpeas-0.7.2[gtk] =20 dev-python/pygobject[introspection] gnome-base/gsettings-desktop-schemas @@ -78,3 +78,7 @@ pkg_postrm() { gnome2_pkg_postrm python_mod_cleanup /usr/$(get_libdir)/gedit/plugins } + +src_prepare() { + epatch "${FILESDIR}/${PN}-libpeas-compat.patch" +} diff --git a/app-editors/gedit/gedit-9999.ebuild b/app-editors/gedit/gedi= t-9999.ebuild index dcb1d87..80c4ee5 100644 --- a/app-editors/gedit/gedit-9999.ebuild +++ b/app-editors/gedit/gedit-9999.ebuild @@ -30,7 +30,7 @@ RDEPEND=3D">=3Dx11-libs/libSM-1.0 >=3Ddev-libs/glib-2.27.92 >=3Dx11-libs/gtk+-2.99.0:3[introspection?] >=3Dx11-libs/gtksourceview-2.91.1:3.0[introspection?] - >=3Ddev-libs/libpeas-0.7.0[gtk] + >=3Ddev-libs/libpeas-0.7.2[gtk] =20 dev-python/pygobject[introspection] gnome-base/gsettings-desktop-schemas @@ -78,3 +78,7 @@ pkg_postrm() { gnome2_pkg_postrm python_mod_cleanup /usr/$(get_libdir)/gedit/plugins } + +src_prepare() { + epatch "${FILESDIR}/${PN}-libpeas-compat.patch" +}