* [gentoo-commits] proj/gnome:master commit in: dev-libs/libpeas/, dev-libs/libpeas/files/
@ 2011-11-03 4:11 Alexandre Restovtsev
0 siblings, 0 replies; 2+ messages in thread
From: Alexandre Restovtsev @ 2011-11-03 4:11 UTC (permalink / raw
To: gentoo-commits
commit: 7432d92b649634ba01819ffa74465a911c4dd628
Author: Alexandre Rostovtsev <tetromino <AT> gentoo <DOT> org>
AuthorDate: Thu Nov 3 03:36:02 2011 +0000
Commit: Alexandre Restovtsev <tetromino <AT> gmail <DOT> com>
CommitDate: Thu Nov 3 04:06:20 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=7432d92b
dev-libs/libpeas: fix g-i annotations + qa
Add an upstream patch to change PeasPluginInfo return values from
transfer full to transfer none; fixes crashes in python code that uses
libpeas.
Drop $(use_enable deprecated depracation): it had no effect (we were
overriding it with --disable-depracation anyway, and there was no
deprecated in IUSE), and disabling deprecations only makes sense for
upstream libpeas developers, not for users.
Port to EAPI4 and let gnome.eclass take care of maintainer mode.
Drop KEYWORDS to match gx86.
---
.../libpeas-1.2.0-PeasPluginInfo-annotation.patch | 57 ++++++++++++++++++++
...ibpeas-1.2.0.ebuild => libpeas-1.2.0-r1.ebuild} | 21 +++++---
dev-libs/libpeas/libpeas-9999.ebuild | 12 ++---
3 files changed, 75 insertions(+), 15 deletions(-)
diff --git a/dev-libs/libpeas/files/libpeas-1.2.0-PeasPluginInfo-annotation.patch b/dev-libs/libpeas/files/libpeas-1.2.0-PeasPluginInfo-annotation.patch
new file mode 100644
index 0000000..3a2e9b4
--- /dev/null
+++ b/dev-libs/libpeas/files/libpeas-1.2.0-PeasPluginInfo-annotation.patch
@@ -0,0 +1,57 @@
+From afa50c526ce1aab53eff3c3373a97180fc90abe2 Mon Sep 17 00:00:00 2001
+From: Garrett Regier <garrettregier@gmail.com>
+Date: Thu, 29 Sep 2011 15:46:49 -0700
+Subject: [PATCH] Annotate PeasPluginInfo return values as transfer none
+
+Otherwise GObject-Introspection says that it is transfer full.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=660524
+---
+ libpeas-gtk/peas-gtk-plugin-manager-view.c | 2 +-
+ libpeas/peas-engine.c | 2 +-
+ libpeas/peas-extension-base.c | 3 ++-
+ 3 files changed, 4 insertions(+), 3 deletions(-)
+
+diff --git a/libpeas-gtk/peas-gtk-plugin-manager-view.c b/libpeas-gtk/peas-gtk-plugin-manager-view.c
+index 7eb7361..5f8f55f 100644
+--- a/libpeas-gtk/peas-gtk-plugin-manager-view.c
++++ b/libpeas-gtk/peas-gtk-plugin-manager-view.c
+@@ -952,7 +952,7 @@ peas_gtk_plugin_manager_view_set_selected_plugin (PeasGtkPluginManagerView *view
+ *
+ * Returns the currently selected plugin, or %NULL if a plugin is not selected.
+ *
+- * Returns: the selected plugin.
++ * Returns: (transfer none): the selected plugin.
+ */
+ PeasPluginInfo *
+ peas_gtk_plugin_manager_view_get_selected_plugin (PeasGtkPluginManagerView *view)
+diff --git a/libpeas/peas-engine.c b/libpeas/peas-engine.c
+index 1adf4ff..7b57d56 100644
+--- a/libpeas/peas-engine.c
++++ b/libpeas/peas-engine.c
+@@ -733,7 +733,7 @@ compare_plugin_info_and_name (PeasPluginInfo *info,
+ * Gets the #PeasPluginInfo corresponding with @plugin_name,
+ * or %NULL if @plugin_name was not found.
+ *
+- * Returns: the #PeasPluginInfo corresponding with
++ * Returns: (transfer none): the #PeasPluginInfo corresponding with
+ * a given plugin module name.
+ */
+ PeasPluginInfo *
+diff --git a/libpeas/peas-extension-base.c b/libpeas/peas-extension-base.c
+index 329a25f..7c4cba0 100644
+--- a/libpeas/peas-extension-base.c
++++ b/libpeas/peas-extension-base.c
+@@ -141,7 +141,8 @@ peas_extension_base_class_init (PeasExtensionBaseClass *klass)
+ *
+ * Get information relative to @extbase.
+ *
+- * Return value: the #PeasPluginInfo relative to the #PeasExtensionBase.
++ * Return value: (transfer none): the #PeasPluginInfo relative
++ * to the #PeasExtensionBase.
+ */
+ PeasPluginInfo *
+ peas_extension_base_get_plugin_info (PeasExtensionBase *extbase)
+--
+1.7.7.2
+
diff --git a/dev-libs/libpeas/libpeas-1.2.0.ebuild b/dev-libs/libpeas/libpeas-1.2.0-r1.ebuild
similarity index 84%
rename from dev-libs/libpeas/libpeas-1.2.0.ebuild
rename to dev-libs/libpeas/libpeas-1.2.0-r1.ebuild
index 9582642..aba6158 100644
--- a/dev-libs/libpeas/libpeas-1.2.0.ebuild
+++ b/dev-libs/libpeas/libpeas-1.2.0-r1.ebuild
@@ -2,13 +2,12 @@
# Distributed under the terms of the GNU General Public License v2
# $Header: $
-EAPI="3"
-GNOME_TARBALL_SUFFIX="xz"
+EAPI="4"
GCONF_DEBUG="no"
GNOME2_LA_PUNT="yes"
PYTHON_DEPEND="python? 2:2.5"
-inherit gnome2 python virtualx
+inherit eutils gnome2 python virtualx
if [[ ${PV} = 9999 ]]; then
inherit gnome2-live
fi
@@ -22,7 +21,7 @@ IUSE="doc gjs +gtk glade +python seed vala"
if [[ ${PV} = 9999 ]]; then
KEYWORDS=""
else
- KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+ KEYWORDS="~amd64 ~x86"
fi
RDEPEND=">=dev-libs/glib-2.23.6:2
@@ -42,7 +41,6 @@ DOCS="AUTHORS ChangeLog NEWS README"
pkg_setup() {
G2CONF="${G2CONF}
- $(use_enable deprecated deprecation)
$(use_enable gjs)
$(use_enable glade glade-catalog)
$(use_enable gtk)
@@ -51,12 +49,19 @@ pkg_setup() {
$(use_enable vala)
VALAC=$(type -P valac-0.12)
--disable-deprecation
- --disable-static
- --disable-maintainer-mode"
+ --disable-static"
# Wtf, --disable-gcov, --enable-gcov=no, --enable-gcov, all enable gcov
# What do we do about gdb, valgrind, gcov, etc?
python_set_active_version 2
+ python_pkg_setup
+}
+
+src_prepare() {
+ # Upstream patch to fix g-i annotations; prevents crashes
+ epatch "${FILESDIR}/${P}-PeasPluginInfo-annotation.patch"
+
+ gnome2_src_prepare
}
src_test() {
@@ -66,5 +71,5 @@ src_test() {
# >>> from gi.repository import Gtk
# >>> Gtk.IconTheme.get_default().has_icon("gtk-about")
# This should return True, it returns False for Xvfb
- Xemake check || die
+ Xemake check
}
diff --git a/dev-libs/libpeas/libpeas-9999.ebuild b/dev-libs/libpeas/libpeas-9999.ebuild
index 9582642..84eb038 100644
--- a/dev-libs/libpeas/libpeas-9999.ebuild
+++ b/dev-libs/libpeas/libpeas-9999.ebuild
@@ -2,8 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
# $Header: $
-EAPI="3"
-GNOME_TARBALL_SUFFIX="xz"
+EAPI="4"
GCONF_DEBUG="no"
GNOME2_LA_PUNT="yes"
PYTHON_DEPEND="python? 2:2.5"
@@ -22,7 +21,7 @@ IUSE="doc gjs +gtk glade +python seed vala"
if [[ ${PV} = 9999 ]]; then
KEYWORDS=""
else
- KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+ KEYWORDS="~amd64 ~x86"
fi
RDEPEND=">=dev-libs/glib-2.23.6:2
@@ -42,7 +41,6 @@ DOCS="AUTHORS ChangeLog NEWS README"
pkg_setup() {
G2CONF="${G2CONF}
- $(use_enable deprecated deprecation)
$(use_enable gjs)
$(use_enable glade glade-catalog)
$(use_enable gtk)
@@ -51,12 +49,12 @@ pkg_setup() {
$(use_enable vala)
VALAC=$(type -P valac-0.12)
--disable-deprecation
- --disable-static
- --disable-maintainer-mode"
+ --disable-static"
# Wtf, --disable-gcov, --enable-gcov=no, --enable-gcov, all enable gcov
# What do we do about gdb, valgrind, gcov, etc?
python_set_active_version 2
+ python_pkg_setup
}
src_test() {
@@ -66,5 +64,5 @@ src_test() {
# >>> from gi.repository import Gtk
# >>> Gtk.IconTheme.get_default().has_icon("gtk-about")
# This should return True, it returns False for Xvfb
- Xemake check || die
+ Xemake check
}
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] proj/gnome:master commit in: dev-libs/libpeas/, dev-libs/libpeas/files/
@ 2018-09-14 8:54 Mart Raudsepp
0 siblings, 0 replies; 2+ messages in thread
From: Mart Raudsepp @ 2018-09-14 8:54 UTC (permalink / raw
To: gentoo-commits
commit: 13c8b1021b1d83c3dcf06779103d91136b6c7877
Author: Mart Raudsepp <leio <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 14 08:52:39 2018 +0000
Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Fri Sep 14 08:52:39 2018 +0000
URL: https://gitweb.gentoo.org/proj/gnome.git/commit/?id=13c8b102
dev-libs/libpeas: remove, available in ::gentoo
Also remove 9999 as it's hopelessly out of date
dev-libs/libpeas/files/libpeas-1.14.0-lua.pc.patch | 18 ----
dev-libs/libpeas/libpeas-1.22.0.ebuild | 84 -------------------
dev-libs/libpeas/libpeas-9999.ebuild | 96 ----------------------
dev-libs/libpeas/metadata.xml | 13 ---
4 files changed, 211 deletions(-)
diff --git a/dev-libs/libpeas/files/libpeas-1.14.0-lua.pc.patch b/dev-libs/libpeas/files/libpeas-1.14.0-lua.pc.patch
deleted file mode 100644
index c46cbee2..00000000
--- a/dev-libs/libpeas/files/libpeas-1.14.0-lua.pc.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Gentoo currently uses unversioned lua:0 - lua.pc instad of lua5.1.pc, /usr/bin/lua instead of /usr/bin/lua5.1
-
-diff --git a/configure.ac b/configure.ac
-index 810a288..51ca607 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -305,9 +305,9 @@ else
- fi
-
- if test "x$found_lua51" != "xyes"; then
-- PKG_CHECK_EXISTS([lua5.1 >= $LUA51_REQUIRED], [
-+ PKG_CHECK_EXISTS([lua >= $LUA51_REQUIRED], [
- found_lua51=yes
-- with_lua51=lua5.1
-+ with_lua51=lua
- ], [
- found_lua51=no
- ])
diff --git a/dev-libs/libpeas/libpeas-1.22.0.ebuild b/dev-libs/libpeas/libpeas-1.22.0.ebuild
deleted file mode 100644
index 021c7d5e..00000000
--- a/dev-libs/libpeas/libpeas-1.22.0.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_LA_PUNT="yes"
-PYTHON_COMPAT=( python{3_4,3_5,3_6} )
-
-inherit autotools eutils gnome2 multilib python-single-r1 virtualx
-
-DESCRIPTION="A GObject plugins library"
-HOMEPAGE="https://developer.gnome.org/libpeas/stable/"
-
-LICENSE="LGPL-2+"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
-
-IUSE="+gtk glade lua luajit +python"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="
- >=dev-libs/glib-2.38:2
- >=dev-libs/gobject-introspection-1.39:=
- glade? ( >=dev-util/glade-3.9.1:3.10 )
- gtk? ( >=x11-libs/gtk+-3:3[introspection] )
- lua? (
- >=dev-lua/lgi-0.9.0
- luajit? ( >=dev-lang/luajit-2:2 )
- !luajit? ( =dev-lang/lua-5.1*:0 ) )
- python? (
- ${PYTHON_DEPS}
- >=dev-python/pygobject-3.2:3[${PYTHON_USEDEP}] )
-"
-DEPEND="${RDEPEND}
- >=dev-util/gtk-doc-am-1.11
- >=dev-util/intltool-0.40
- virtual/pkgconfig
-
- dev-libs/gobject-introspection-common
- gnome-base/gnome-common
-"
-# eautoreconf needs gobject-introspection-common, gnome-common
-
-pkg_setup() {
- use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
- # Gentoo uses unversioned lua - lua.pc instad of lua5.1.pc, /usr/bin/lua instead of /usr/bin/lua5.1
- eapply "${FILESDIR}"/${PN}-1.14.0-lua.pc.patch
- eautoreconf
- gnome2_src_prepare
-}
-
-src_configure() {
- # Wtf, --disable-gcov, --enable-gcov=no, --enable-gcov, all enable gcov
- # What do we do about gdb, valgrind, gcov, etc?
- local myconf=(
- $(use_enable glade glade-catalog)
- $(use_enable gtk)
- --disable-static
-
- # py2 not supported anymore
- --disable-python2
- $(use_enable python python3)
-
- # lua
- $(use_enable lua lua5.1)
- $(use_enable $(usex luajit lua luajit) luajit)
- )
-
- gnome2_src_configure "${myconf[@]}"
-}
-
-src_test() {
- # This looks fixed since 1.18.0:
- #
- # FIXME: Tests fail because of some bug involving Xvfb and Gtk.IconTheme
- # DO NOT REPORT UPSTREAM, this is not a libpeas bug.
- # To reproduce:
- # >>> from gi.repository import Gtk
- # >>> Gtk.IconTheme.get_default().has_icon("gtk-about")
- # This should return True, it returns False for Xvfb
- virtx emake check
-}
diff --git a/dev-libs/libpeas/libpeas-9999.ebuild b/dev-libs/libpeas/libpeas-9999.ebuild
deleted file mode 100644
index f18229ac..00000000
--- a/dev-libs/libpeas/libpeas-9999.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-GCONF_DEBUG="no"
-PYTHON_COMPAT=( python{2_7,3_3,3_4} )
-
-inherit gnome2 multilib python-r1 virtualx
-if [[ ${PV} = 9999 ]]; then
- inherit gnome2-live
-fi
-
-DESCRIPTION="A GObject plugins library"
-HOMEPAGE="http://developer.gnome.org/libpeas/stable/"
-
-LICENSE="LGPL-2+"
-SLOT="0"
-IUSE="+gtk glade jit lua +python"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} ?? ( $(python_gen_useflags 'python3*') ) )"
-if [[ ${PV} = 9999 ]]; then
- IUSE="${IUSE} doc"
- KEYWORDS=""
-else
- KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux"
-fi
-
-RDEPEND="
- >=dev-libs/glib-2.38:2
- >=dev-libs/gobject-introspection-1.39
- glade? ( >=dev-util/glade-3.9.1:3.10 )
- gtk? ( >=x11-libs/gtk+-3:3[introspection] )
- lua? (
- dev-lua/lgi
- jit? ( >=dev-lang/luajit-2:2 )
- !jit? ( >=dev-lang/lua-5.1:0 ) )
- python? (
- ${PYTHON_DEPS}
- >=dev-python/pygobject-3.2:3[${PYTHON_USEDEP}] )
-"
-DEPEND="${RDEPEND}
- >=dev-util/gtk-doc-am-1.11
- >=dev-util/intltool-0.40
- virtual/pkgconfig
-"
-
-if [[ ${PV} = 9999 ]]; then
- DEPEND="${DEPEND} doc? ( >=dev-util/gtk-doc-1.11 )"
-fi
-
-src_configure() {
- # Wtf, --disable-gcov, --enable-gcov=no, --enable-gcov, all enable gcov
- # What do we do about gdb, valgrind, gcov, etc?
- local myconf=(
- $(use_enable glade glade-catalog)
- $(use_enable gtk)
- --disable-static
-
- # possibly overriden below
- --disable-python{2,3}
- --disable-lua5.1
- --disable-luajit
- )
-
- if use lua ; then
- if use jit ; then
- myconf+=( --enable-luajit )
- else
- myconf+=( --enable-lua5.1 )
- fi
- fi
-
- python_configure() {
- local v
- python_is_python3 && v=3 || v=2
- myconf+=(
- "--enable-python${v}"
- # it is just 'PYTHON' for py3 in the build system
- "PYTHON${v#3}=${PYTHON}"
- "PYTHON${v}_CONFIG=${PYTHON}-config"
- )
- }
- use python && python_foreach_impl python_configure
-
- gnome2_src_configure "${myconf[@]}"
-}
-
-src_test() {
- # FIXME: Tests fail because of some bug involving Xvfb and Gtk.IconTheme
- # DO NOT REPORT UPSTREAM, this is not a libpeas bug.
- # To reproduce:
- # >>> from gi.repository import Gtk
- # >>> Gtk.IconTheme.get_default().has_icon("gtk-about")
- # This should return True, it returns False for Xvfb
- Xemake check
-}
diff --git a/dev-libs/libpeas/metadata.xml b/dev-libs/libpeas/metadata.xml
deleted file mode 100644
index f955af2b..00000000
--- a/dev-libs/libpeas/metadata.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>gnome@gentoo.org</email>
- <name>Gentoo GNOME Desktop</name>
- </maintainer>
- <use>
- <flag name="glade">Install the glade catalog</flag>
- <flag name="python">Build support for loading <pkg>dev-lang/python</pkg>
- plugins</flag>
- </use>
-</pkgmetadata>
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2018-09-14 8:54 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-11-03 4:11 [gentoo-commits] proj/gnome:master commit in: dev-libs/libpeas/, dev-libs/libpeas/files/ Alexandre Restovtsev
-- strict thread matches above, loose matches on Subject: below --
2018-09-14 8:54 Mart Raudsepp
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox