- update to 0.4.1
This commit is contained in:
jasper
parent
340d33c49c
commit
21d9ba6dcd
@ -1,10 +1,9 @@
|
||||
# $OpenBSD: Makefile,v 1.3 2011/09/30 07:23:22 jasper Exp $
|
||||
# $OpenBSD: Makefile,v 1.4 2011/09/30 11:45:43 jasper Exp $
|
||||
|
||||
COMMENT= Easy Publish and Consume library
|
||||
|
||||
GNOME_PROJECT= libepc
|
||||
GNOME_VERSION= 0.4.0
|
||||
REVISION= 1
|
||||
GNOME_VERSION= 0.4.1
|
||||
SHARED_LIBS += epc-1.0 0.0 # 3.0
|
||||
SHARED_LIBS += epc-ui-1.0 0.0 # 3.0
|
||||
CATEGORIES= net
|
||||
@ -17,8 +16,6 @@ PERMIT_DISTFILES_CDROM= Yes
|
||||
PERMIT_PACKAGE_FTP= Yes
|
||||
PERMIT_PACKAGE_CDROM= Yes
|
||||
|
||||
EXTRACT_SUFX= .tar.bz2
|
||||
|
||||
MODULES= devel/gettext \
|
||||
x11/gnome
|
||||
|
||||
@ -39,9 +36,7 @@ LIB_DEPENDS= devel/libsoup \
|
||||
sysutils/e2fsprogs \
|
||||
x11/gtk+3
|
||||
|
||||
AUTOCONF_VERSION= 2.68
|
||||
|
||||
CONFIGURE_STYLE= autoconf
|
||||
CONFIGURE_STYLE= gnu
|
||||
|
||||
# Not much of use without a proper SIOCGIFINDEX
|
||||
NO_REGRESS= Yes
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
MD5 (libepc-0.4.0.tar.bz2) = x/3hGFRtCddHr3sIy1K/rQ==
|
||||
RMD160 (libepc-0.4.0.tar.bz2) = 1/30WA9zEUKmCPs2MM8pJ/3acF0=
|
||||
SHA1 (libepc-0.4.0.tar.bz2) = u2F2PgE4rHuFs9PDAp9bLAq5TRA=
|
||||
SHA256 (libepc-0.4.0.tar.bz2) = Kw42lq49ULxtB9SCUg70VeubQqlsQigIHedX74E+22w=
|
||||
SIZE (libepc-0.4.0.tar.bz2) = 441692
|
||||
MD5 (libepc-0.4.1.tar.xz) = aFStjW3ZQHD1awMzKaMgrA==
|
||||
RMD160 (libepc-0.4.1.tar.xz) = ffhcTv/fshaooe4lbC4WFknlUis=
|
||||
SHA1 (libepc-0.4.1.tar.xz) = I/QulWzhJ1DXlU4iKhaMOo+7xK8=
|
||||
SHA256 (libepc-0.4.1.tar.xz) = E3fe/TORIqXvcVCdO3YYEMWPF4mF1lW3S8NHYO9K5J4=
|
||||
SIZE (libepc-0.4.1.tar.xz) = 374932
|
||||
|
||||
@ -1,18 +0,0 @@
|
||||
$OpenBSD: patch-configure_ac,v 1.1.1.1 2011/09/29 17:07:03 jasper Exp $
|
||||
|
||||
From a08655df4081f76053f22c0c587a25a3f0443792 Mon Sep 17 00:00:00 2001
|
||||
From: Murray Cumming <murrayc@murrayc.com>
|
||||
Date: Wed, 31 Aug 2011 12:19:47 +0000
|
||||
Subject: Really use GTK+ 3.
|
||||
|
||||
--- configure.ac.orig Thu Sep 29 16:54:42 2011
|
||||
+++ configure.ac Thu Sep 29 16:55:00 2011
|
||||
@@ -80,7 +80,7 @@ PKG_CHECK_MODULES(LIBEPC, [avahi-client >= 0.6
|
||||
uuid >= 1.36
|
||||
$LIBSOUP
|
||||
$GIO])
|
||||
-PKG_CHECK_MODULES(LIBEPC_UI, [gtk+-2.0 >= 2.10])
|
||||
+PKG_CHECK_MODULES(LIBEPC_UI, [gtk+-3.0 >= 3.0])
|
||||
|
||||
AC_SUBST(AVAHI_UI_CFLAGS)
|
||||
AC_SUBST(AVAHI_UI_LIBS)
|
||||
@ -1,45 +0,0 @@
|
||||
$OpenBSD: patch-examples_consumer-ui_c,v 1.1.1.1 2011/09/29 17:07:03 jasper Exp $
|
||||
|
||||
From a08655df4081f76053f22c0c587a25a3f0443792 Mon Sep 17 00:00:00 2001
|
||||
From: Murray Cumming <murrayc@murrayc.com>
|
||||
Date: Wed, 31 Aug 2011 12:19:47 +0000
|
||||
Subject: Really use GTK+ 3.
|
||||
|
||||
--- examples/consumer-ui.c.orig Thu May 12 21:25:44 2011
|
||||
+++ examples/consumer-ui.c Thu Sep 29 16:55:00 2011
|
||||
@@ -35,7 +35,7 @@ list_keys (EpcConsumer *consumer,
|
||||
keys = g_list_sort (keys, (GCompareFunc) strcmp);
|
||||
|
||||
for (iter = keys; iter; iter = iter->next)
|
||||
- gtk_combo_box_append_text (GTK_COMBO_BOX (keys_combo), iter->data);
|
||||
+ gtk_combo_box_text_append (GTK_COMBO_BOX_TEXT (keys_combo), NULL, iter->data);
|
||||
|
||||
gtk_combo_box_set_active (GTK_COMBO_BOX (keys_combo), 0);
|
||||
gtk_widget_set_sensitive (keys_combo, TRUE);
|
||||
@@ -71,7 +71,7 @@ keys_combo_changed_cb (GtkComboBox *combo_box,
|
||||
|
||||
/* retreive a the currently selected resource */
|
||||
|
||||
- key = gtk_combo_box_get_active_text (combo_box);
|
||||
+ key = gtk_combo_box_text_get_active_text (GTK_COMBO_BOX_TEXT (combo_box));
|
||||
|
||||
if (key)
|
||||
value = epc_consumer_lookup (consumer, key, &length, &error);
|
||||
@@ -120,7 +120,7 @@ create_lookup_dialog (EpcConsumer *consumer,
|
||||
|
||||
/* Setup the combo box listing keys. */
|
||||
|
||||
- keys_combo = gtk_combo_box_new_text ();
|
||||
+ keys_combo = gtk_combo_box_text_new ();
|
||||
gtk_widget_set_sensitive (keys_combo, FALSE);
|
||||
|
||||
g_signal_connect (keys_combo, "changed",
|
||||
@@ -165,7 +165,7 @@ create_lookup_dialog (EpcConsumer *consumer,
|
||||
/* Create the dialog widget. */
|
||||
|
||||
dialog = gtk_dialog_new_with_buttons ("Published Value", NULL,
|
||||
- GTK_DIALOG_NO_SEPARATOR,
|
||||
+ (GtkDialogFlags)0,
|
||||
GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE,
|
||||
NULL);
|
||||
|
||||
@ -1,43 +0,0 @@
|
||||
$OpenBSD: patch-examples_publisher-ui_c,v 1.1.1.1 2011/09/29 17:07:03 jasper Exp $
|
||||
|
||||
From a08655df4081f76053f22c0c587a25a3f0443792 Mon Sep 17 00:00:00 2001
|
||||
From: Murray Cumming <murrayc@murrayc.com>
|
||||
Date: Wed, 31 Aug 2011 12:19:47 +0000
|
||||
Subject: Really use GTK+ 3.
|
||||
|
||||
--- examples/publisher-ui.c.orig Thu May 12 21:11:43 2011
|
||||
+++ examples/publisher-ui.c Thu Sep 29 16:55:00 2011
|
||||
@@ -366,25 +366,6 @@ schedule_auto_save (void)
|
||||
auto_save_id = g_timeout_add (5 * 1000, auto_save_cb, NULL);
|
||||
}
|
||||
|
||||
-static void
|
||||
-url_hook (GtkAboutDialog *dialog,
|
||||
- const gchar *link,
|
||||
- gpointer data G_GNUC_UNUSED)
|
||||
-{
|
||||
- gchar *args[] = { "xdg-open", (gchar*) link, NULL };
|
||||
- GError *error = NULL;
|
||||
-
|
||||
- gdk_spawn_on_screen (gtk_widget_get_screen (GTK_WIDGET (dialog)),
|
||||
- NULL, args, NULL, G_SPAWN_SEARCH_PATH,
|
||||
- NULL, NULL, NULL, &error);
|
||||
-
|
||||
- if (error)
|
||||
- {
|
||||
- show_error (GTK_WIDGET (dialog), "Cannot follow link.", error);
|
||||
- g_error_free (error);
|
||||
- }
|
||||
-}
|
||||
-
|
||||
void
|
||||
about_button_clicked_cb (GtkWidget *widget)
|
||||
{
|
||||
@@ -799,7 +780,6 @@ main (int argc,
|
||||
g_set_application_name ("Easy Publisher Example");
|
||||
|
||||
gtk_init (&argc, &argv);
|
||||
- gtk_about_dialog_set_url_hook (url_hook, NULL, NULL);
|
||||
|
||||
builder = gtk_builder_new ();
|
||||
load_ui (argv[0]);
|
||||
Loading…
Reference in New Issue
Block a user