Update to libpeas-1.1.4 to work with py-gobject3.

ok jasper@
This commit is contained in:
ajacoutot 2011-09-22 16:01:02 +00:00
parent ca824c1b9e
commit ef3af39718
5 changed files with 22 additions and 103 deletions

View File

@ -1,11 +1,9 @@
# $OpenBSD: Makefile,v 1.11 2011/09/22 10:16:27 jasper Exp $
# $OpenBSD: Makefile,v 1.12 2011/09/22 16:01:02 ajacoutot Exp $
COMMENT= gobject-based plugins engine
GNOME_PROJECT= libpeas
GNOME_VERSION= 1.0.0
REVISION= 6
GNOME_VERSION= 1.1.4
CATEGORIES= devel
@ -23,8 +21,6 @@ PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
EXTRACT_SUFX= .tar.bz2
WANTLIB += GL ICE SM X11 Xau Xcomposite Xcursor Xdamage Xdmcp
WANTLIB += Xext Xfixes Xi Xinerama Xrandr Xrender Xt Xxf86vm atk-1.0
WANTLIB += c cairo cairo-gobject drm enchant expat ffi fontconfig
@ -35,15 +31,14 @@ WANTLIB += gthread-2.0 gtk-3 icudata icui18n icuuc jpeg m pango-1.0
WANTLIB += pangocairo-1.0 pangoft2-1.0 pcre pixman-1 png pthread
WANTLIB += pthread-stubs seed-gtk3 soup-2.4 sqlite3
WANTLIB += stdc++ util webkitgtk-3.0 xcb xcb-render xcb-shm xml2
WANTLIB += xslt z ${MODPY_WANTLIB}
WANTLIB += kvm xslt z ${MODPY_WANTLIB}
MODULES= devel/gettext \
x11/gnome \
lang/python
RUN_DEPENDS= devel/py-gobject
BUILD_DEPENDS= devel/py-gobject
RUN_DEPENDS= devel/py-gobject3
BUILD_DEPENDS= devel/py-gobject3
MODGNOME_TOOLS= vala

View File

@ -1,5 +1,5 @@
MD5 (libpeas-1.0.0.tar.bz2) = 1xY1juwS1EOdBMM3cz8fYA==
RMD160 (libpeas-1.0.0.tar.bz2) = ZqBN/Vxy0GEYSJN6WAVaxxcEREg=
SHA1 (libpeas-1.0.0.tar.bz2) = 8VyvC3xGIZee/1vKBvVn0tSChEM=
SHA256 (libpeas-1.0.0.tar.bz2) = sUgmkFZSQbrzhwMRp377P4mkM19Iy0yjHouEBSIKjZk=
SIZE (libpeas-1.0.0.tar.bz2) = 598820
MD5 (libpeas-1.1.4.tar.bz2) = SUTR3XAbwJpIp3DT+4jwzQ==
RMD160 (libpeas-1.1.4.tar.bz2) = TDzoJcb84kvuFUnG/kP8e2OV4zc=
SHA1 (libpeas-1.1.4.tar.bz2) = GlfUOCzr1zRuYOnkU0uwEd11r7w=
SHA256 (libpeas-1.1.4.tar.bz2) = KgvoQPgiqXvN5MCe7H3V5mNdS9O/gzJ6R0GYaZQh/lY=
SIZE (libpeas-1.1.4.tar.bz2) = 643048

View File

@ -1,58 +0,0 @@
$OpenBSD: patch-libpeas-gtk_peas-gtk-plugin-manager_c,v 1.1 2011/09/22 10:16:27 jasper Exp $
From 394c8d940d8eae42afb30f00e9c2c366fbcfcda3 Mon Sep 17 00:00:00 2001
From: Garrett Regier <alias301@gmail.com>
Date: Sat, 11 Jun 2011 22:37:15 +0000
Subject: No longer use Gtk[HV]Box as it is deprecated
--- libpeas-gtk/peas-gtk-plugin-manager.c.orig Sun Feb 13 17:08:45 2011
+++ libpeas-gtk/peas-gtk-plugin-manager.c Thu Sep 22 11:59:31 2011
@@ -76,7 +76,7 @@ enum {
PROP_VIEW
};
-G_DEFINE_TYPE (PeasGtkPluginManager, peas_gtk_plugin_manager, GTK_TYPE_VBOX);
+G_DEFINE_TYPE (PeasGtkPluginManager, peas_gtk_plugin_manager, GTK_TYPE_BOX);
static gboolean
plugin_is_configurable (PeasGtkPluginManager *pm,
@@ -266,13 +266,14 @@ show_configure_cb (GtkWidget *widget,
if (peas_plugin_info_get_help_uri (info) != NULL)
{
- GtkWidget *buttonbox;
+ GtkWidget *hbuttonbox;
GtkWidget *help_button;
- buttonbox = gtk_dialog_get_action_area (GTK_DIALOG (conf_dlg));
+ hbuttonbox = gtk_dialog_get_action_area (GTK_DIALOG (conf_dlg));
help_button = gtk_button_new_from_stock (GTK_STOCK_HELP);
- gtk_container_add (GTK_CONTAINER (buttonbox), help_button);
- gtk_button_box_set_child_secondary (GTK_BUTTON_BOX (buttonbox), help_button, TRUE);
+ gtk_container_add (GTK_CONTAINER (hbuttonbox), help_button);
+ gtk_button_box_set_child_secondary (GTK_BUTTON_BOX (hbuttonbox),
+ help_button, TRUE);
g_signal_connect (help_button,
"clicked",
@@ -374,6 +375,8 @@ peas_gtk_plugin_manager_init (PeasGtkPluginManager *pm
"PeasGtk", "1.0", 0, NULL);
gtk_box_set_spacing (GTK_BOX (pm), 6);
+ gtk_orientable_set_orientation (GTK_ORIENTABLE (pm),
+ GTK_ORIENTATION_VERTICAL);
gtk_widget_push_composite_child ();
@@ -390,9 +393,9 @@ peas_gtk_plugin_manager_init (PeasGtkPluginManager *pm
gtk_label_set_mnemonic_widget (GTK_LABEL (label), pm->priv->sw);
gtk_box_pack_start (GTK_BOX (pm), pm->priv->sw, TRUE, TRUE, 0);
- hbuttonbox = gtk_hbutton_box_new ();
- gtk_button_box_set_layout (GTK_BUTTON_BOX (hbuttonbox), GTK_BUTTONBOX_END);
+ hbuttonbox = gtk_button_box_new (GTK_ORIENTATION_HORIZONTAL);
gtk_box_set_spacing (GTK_BOX (hbuttonbox), 6);
+ gtk_button_box_set_layout (GTK_BUTTON_BOX (hbuttonbox), GTK_BUTTONBOX_END);
gtk_box_pack_start (GTK_BOX (pm), hbuttonbox, FALSE, FALSE, 0);
pm->priv->about_button = gtk_button_new_from_stock (GTK_STOCK_ABOUT);

View File

@ -1,27 +0,0 @@
$OpenBSD: patch-libpeas-gtk_peas-gtk-plugin-manager_h,v 1.1 2011/09/22 10:16:27 jasper Exp $
From 394c8d940d8eae42afb30f00e9c2c366fbcfcda3 Mon Sep 17 00:00:00 2001
From: Garrett Regier <alias301@gmail.com>
Date: Sat, 11 Jun 2011 22:37:15 +0000
Subject: No longer use Gtk[HV]Box as it is deprecated
--- libpeas-gtk/peas-gtk-plugin-manager.h.orig Thu Sep 22 12:13:05 2011
+++ libpeas-gtk/peas-gtk-plugin-manager.h Thu Sep 22 12:13:19 2011
@@ -43,7 +43,7 @@ typedef struct _PeasGtkPluginManagerPrivate PeasGtkPlu
struct _PeasGtkPluginManager
{
- GtkVBox vbox;
+ GtkBox vbox;
/*< private > */
PeasGtkPluginManagerPrivate *priv;
@@ -51,7 +51,7 @@ struct _PeasGtkPluginManager
struct _PeasGtkPluginManagerClass
{
- GtkVBoxClass parent_class;
+ GtkBoxClass parent_class;
gpointer padding[8];
};

View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.4 2011/06/10 09:38:18 ajacoutot Exp $
@comment $OpenBSD: PLIST,v 1.5 2011/09/22 16:01:02 ajacoutot Exp $
@bin bin/peas-demo
include/libpeas-1.0/
include/libpeas-1.0/libpeas/
@ -58,7 +58,6 @@ share/gir-1.0/PeasGtk-1.0.gir
share/gtk-doc/html/libpeas/
share/gtk-doc/html/libpeas/PeasActivatable.html
share/gtk-doc/html/libpeas/PeasEngine.html
share/gtk-doc/html/libpeas/PeasExtension.html
share/gtk-doc/html/libpeas/PeasExtensionBase.html
share/gtk-doc/html/libpeas/PeasExtensionSet.html
share/gtk-doc/html/libpeas/PeasGtkConfigurable.html
@ -75,7 +74,7 @@ share/gtk-doc/html/libpeas/home.png
share/gtk-doc/html/libpeas/index.html
share/gtk-doc/html/libpeas/index.sgml
share/gtk-doc/html/libpeas/left.png
share/gtk-doc/html/libpeas/libpeas.devhelp
share/gtk-doc/html/libpeas/libpeas-PeasExtension.html
share/gtk-doc/html/libpeas/libpeas.devhelp2
share/gtk-doc/html/libpeas/peas-gtk-plugin-manager.png
share/gtk-doc/html/libpeas/pt01.html
@ -88,16 +87,22 @@ share/icons/hicolor/32x32/actions/libpeas-plugin.png
share/icons/hicolor/scalable/actions/libpeas-plugin.svg
share/locale/ar/LC_MESSAGES/libpeas.mo
share/locale/as/LC_MESSAGES/libpeas.mo
share/locale/ast/LC_MESSAGES/libpeas.mo
share/locale/be/LC_MESSAGES/libpeas.mo
share/locale/bg/LC_MESSAGES/libpeas.mo
share/locale/ca/LC_MESSAGES/libpeas.mo
share/locale/ca@valencia/LC_MESSAGES/libpeas.mo
share/locale/cs/LC_MESSAGES/libpeas.mo
share/locale/da/LC_MESSAGES/libpeas.mo
share/locale/de/LC_MESSAGES/libpeas.mo
share/locale/el/LC_MESSAGES/libpeas.mo
share/locale/en_GB/LC_MESSAGES/libpeas.mo
share/locale/eo/LC_MESSAGES/libpeas.mo
share/locale/es/LC_MESSAGES/libpeas.mo
share/locale/et/LC_MESSAGES/libpeas.mo
share/locale/eu/LC_MESSAGES/libpeas.mo
share/locale/fa/LC_MESSAGES/libpeas.mo
share/locale/fi/LC_MESSAGES/libpeas.mo
share/locale/fr/LC_MESSAGES/libpeas.mo
share/locale/gl/LC_MESSAGES/libpeas.mo
share/locale/gu/LC_MESSAGES/libpeas.mo
@ -106,7 +111,9 @@ share/locale/hi/LC_MESSAGES/libpeas.mo
share/locale/hu/LC_MESSAGES/libpeas.mo
share/locale/id/LC_MESSAGES/libpeas.mo
share/locale/it/LC_MESSAGES/libpeas.mo
share/locale/ja/LC_MESSAGES/libpeas.mo
share/locale/ko/LC_MESSAGES/libpeas.mo
share/locale/lt/LC_MESSAGES/libpeas.mo
share/locale/lv/LC_MESSAGES/libpeas.mo
share/locale/nb/LC_MESSAGES/libpeas.mo
share/locale/nds/LC_MESSAGES/libpeas.mo
@ -122,6 +129,8 @@ share/locale/sr/LC_MESSAGES/libpeas.mo
share/locale/sr@latin/LC_MESSAGES/libpeas.mo
share/locale/sv/LC_MESSAGES/libpeas.mo
share/locale/ta/LC_MESSAGES/libpeas.mo
share/locale/th/LC_MESSAGES/libpeas.mo
share/locale/tr/LC_MESSAGES/libpeas.mo
share/locale/ug/LC_MESSAGES/libpeas.mo
share/locale/uk/LC_MESSAGES/libpeas.mo
share/locale/vi/LC_MESSAGES/libpeas.mo