From 9ab0fd82a49af8f8cc34a1ededea350d4a254a68 Mon Sep 17 00:00:00 2001 From: jasper Date: Tue, 18 Dec 2012 20:41:36 +0000 Subject: [PATCH] - update to moserial-3.0.8 --- x11/gnome/moserial/Makefile | 7 ++-- x11/gnome/moserial/distinfo | 4 +- .../moserial/patches/patch-src_MainWindow_c | 42 +++++++++---------- .../patches/patch-src_SerialConnection_c | 14 ++----- .../moserial/patches/patch-src_Settings_c | 8 ++-- x11/gnome/moserial/pkg/PLIST | 4 +- 6 files changed, 38 insertions(+), 41 deletions(-) diff --git a/x11/gnome/moserial/Makefile b/x11/gnome/moserial/Makefile index 5d753e28484..abf3c18e135 100644 --- a/x11/gnome/moserial/Makefile +++ b/x11/gnome/moserial/Makefile @@ -1,10 +1,9 @@ -# $OpenBSD: Makefile,v 1.19 2012/06/15 08:30:20 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.20 2012/12/18 20:41:36 jasper Exp $ COMMENT= serial terminal for GNOME GNOME_PROJECT= moserial -GNOME_VERSION= 3.0.7 -REVISION= 0 +GNOME_VERSION= 3.0.8 CATEGORIES= comms @@ -26,6 +25,8 @@ WANTLIB += gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0 gthread-2.0 WANTLIB += gtk-3 m pango-1.0 pangocairo-1.0 pangoft2-1.0 pcre WANTLIB += pixman-1 png pthread pthread-stubs xcb xcb-render xcb-shm WANTLIB += z ffi stdc++ +WANTLIB += ICE SM atk-bridge-2.0 atspi dbus-1 harfbuzz icudata +WANTLIB += icule icuuc LIB_DEPENDS= x11/gtk+3 diff --git a/x11/gnome/moserial/distinfo b/x11/gnome/moserial/distinfo index fc65843f7db..9ed2e3ca44d 100644 --- a/x11/gnome/moserial/distinfo +++ b/x11/gnome/moserial/distinfo @@ -1,2 +1,2 @@ -SHA256 (gnome/moserial-3.0.7.tar.xz) = axWz6RbtPCK7SVHJ+BORnr0e7Ea4uis2bQIwk2Bm280= -SIZE (gnome/moserial-3.0.7.tar.xz) = 1046932 +SHA256 (gnome/moserial-3.0.8.tar.xz) = uqU/sEZIVlPRbqh5ByovKbE4+uztkvfR/wRbqNt1IHM= +SIZE (gnome/moserial-3.0.8.tar.xz) = 1067152 diff --git a/x11/gnome/moserial/patches/patch-src_MainWindow_c b/x11/gnome/moserial/patches/patch-src_MainWindow_c index 5bef5e1f524..6b0ab7b365d 100644 --- a/x11/gnome/moserial/patches/patch-src_MainWindow_c +++ b/x11/gnome/moserial/patches/patch-src_MainWindow_c @@ -1,24 +1,24 @@ -$OpenBSD: patch-src_MainWindow_c,v 1.3 2011/10/05 16:55:43 jasper Exp $ +$OpenBSD: patch-src_MainWindow_c,v 1.4 2012/12/18 20:41:36 jasper Exp $ Tweak message if the device can't be opened. ---- src/MainWindow.c.orig Wed Oct 5 17:06:42 2011 -+++ src/MainWindow.c Wed Oct 5 17:08:12 2011 -@@ -1381,6 +1381,7 @@ void moserial_main_window_startRecording (moserialMain - { - GError * e; - const gchar* _tmp3_ = NULL; -+ const gchar* _tmp31_ = NULL; - gchar* _tmp4_ = NULL; - gchar* _tmp5_; - GtkMessageDialog* _tmp6_ = NULL; -@@ -1389,7 +1390,8 @@ void moserial_main_window_startRecording (moserialMain - e = _inner_error_; - _inner_error_ = NULL; - _tmp3_ = _ ("Error: Could not open file"); -- _tmp4_ = g_strdup_printf ("%s: %s\n%s", _tmp3_, filename, e->message); -+ _tmp31_ = _ ("Make sure you are a member of the dialer group"); -+ _tmp4_ = g_strdup_printf ("%s: %s\n%s\n%s", _tmp3_, filename, e->message, _tmp31_); - _tmp5_ = _tmp4_; - _tmp6_ = (GtkMessageDialog*) gtk_message_dialog_new (self->priv->gtkWindow, GTK_DIALOG_DESTROY_WITH_PARENT, GTK_MESSAGE_ERROR, GTK_BUTTONS_CLOSE, _tmp5_); - _tmp7_ = g_object_ref_sink (_tmp6_); +--- src/MainWindow.c.orig Tue Dec 18 21:34:33 2012 ++++ src/MainWindow.c Tue Dec 18 21:36:59 2012 +@@ -1823,6 +1823,7 @@ void moserial_main_window_startRecording (moserialMain + GtkWindow* _tmp10_; + const gchar* _tmp11_ = NULL; + const gchar* _tmp12_; ++ const gchar* _tmp111_ = NULL; + GError* _tmp13_; + const gchar* _tmp14_; + GtkMessageDialog* _tmp15_; +@@ -1838,7 +1839,8 @@ void moserial_main_window_startRecording (moserialMain + _tmp12_ = filename; + _tmp13_ = e; + _tmp14_ = _tmp13_->message; +- _tmp15_ = (GtkMessageDialog*) gtk_message_dialog_new (_tmp10_, GTK_DIALOG_DESTROY_WITH_PARENT, GTK_MESSAGE_ERROR, GTK_BUTTONS_CLOSE, "%s: %s\n%s", _tmp11_, _tmp12_, _tmp14_); ++ _tmp111_ = _ ("Make sure you are a member of the dialer group"); ++ _tmp15_ = (GtkMessageDialog*) gtk_message_dialog_new (_tmp10_, GTK_DIALOG_DESTROY_WITH_PARENT, GTK_MESSAGE_ERROR, GTK_BUTTONS_CLOSE, "%s: %s\n%s\n%s", _tmp11_, _tmp12_, _tmp14_, _tmp111_); + _tmp16_ = g_object_ref_sink (_tmp15_); + errorDialog = _tmp16_; + _tmp17_ = errorDialog; diff --git a/x11/gnome/moserial/patches/patch-src_SerialConnection_c b/x11/gnome/moserial/patches/patch-src_SerialConnection_c index be8c8a17bed..c8d1aff96c0 100644 --- a/x11/gnome/moserial/patches/patch-src_SerialConnection_c +++ b/x11/gnome/moserial/patches/patch-src_SerialConnection_c @@ -1,16 +1,10 @@ -$OpenBSD: patch-src_SerialConnection_c,v 1.3 2011/10/05 16:55:43 jasper Exp $ +$OpenBSD: patch-src_SerialConnection_c,v 1.4 2012/12/18 20:41:36 jasper Exp $ -- Remove non-existing header: - https://bugzilla.gnome.org/show_bug.cgi?id=656690#c3 - Add missing baud rates defines. ---- src/SerialConnection.c.orig Wed Oct 5 16:40:20 2011 -+++ src/SerialConnection.c Wed Oct 5 17:54:06 2011 -@@ -30,10 +30,29 @@ - #include - #include - #include --#include +--- src/SerialConnection.c.orig Tue Dec 18 21:37:31 2012 ++++ src/SerialConnection.c Tue Dec 18 21:38:18 2012 +@@ -33,6 +33,26 @@ #include #include diff --git a/x11/gnome/moserial/patches/patch-src_Settings_c b/x11/gnome/moserial/patches/patch-src_Settings_c index 2535596989a..8ed62bbbdc1 100644 --- a/x11/gnome/moserial/patches/patch-src_Settings_c +++ b/x11/gnome/moserial/patches/patch-src_Settings_c @@ -1,10 +1,10 @@ -$OpenBSD: patch-src_Settings_c,v 1.3 2011/10/05 16:55:43 jasper Exp $ +$OpenBSD: patch-src_Settings_c,v 1.4 2012/12/18 20:41:36 jasper Exp $ Remove Linux device names in favor of what BSD uses. ---- src/Settings.c.orig Wed Oct 5 17:10:39 2011 -+++ src/Settings.c Wed Oct 5 17:10:55 2011 -@@ -581,7 +581,7 @@ static void settings_class_init (SettingsClass * klass +--- src/Settings.c.orig Tue Dec 18 16:20:04 2012 ++++ src/Settings.c Tue Dec 18 21:38:30 2012 +@@ -745,7 +745,7 @@ static void settings_class_init (SettingsClass * klass g_object_class_install_property (G_OBJECT_CLASS (klass), SETTINGS_HANDSHAKE, g_param_spec_enum ("handshake", "handshake", "handshake", SETTINGS_TYPE_HANDSHAKE, 0, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY)); g_object_class_install_property (G_OBJECT_CLASS (klass), SETTINGS_ACCESS_MODE, g_param_spec_enum ("accessMode", "accessMode", "accessMode", SETTINGS_TYPE_ACCESS_MODE, 0, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY)); g_object_class_install_property (G_OBJECT_CLASS (klass), SETTINGS_LOCAL_ECHO, g_param_spec_boolean ("localEcho", "localEcho", "localEcho", FALSE, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY)); diff --git a/x11/gnome/moserial/pkg/PLIST b/x11/gnome/moserial/pkg/PLIST index fb217e2fdbf..f414f6c32ec 100644 --- a/x11/gnome/moserial/pkg/PLIST +++ b/x11/gnome/moserial/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $OpenBSD: PLIST,v 1.7 2012/06/15 08:30:20 ajacoutot Exp $ +@comment $OpenBSD: PLIST,v 1.8 2012/12/18 20:41:36 jasper Exp $ @bin bin/moserial @man man/man1/moserial.1 share/applications/moserial.desktop @@ -158,12 +158,14 @@ share/locale/ca/LC_MESSAGES/moserial.mo share/locale/cs/LC_MESSAGES/moserial.mo share/locale/da/LC_MESSAGES/moserial.mo share/locale/de/LC_MESSAGES/moserial.mo +share/locale/el/LC_MESSAGES/moserial.mo share/locale/es/LC_MESSAGES/moserial.mo share/locale/fr/LC_MESSAGES/moserial.mo share/locale/gl/LC_MESSAGES/moserial.mo share/locale/ja/LC_MESSAGES/moserial.mo share/locale/ko/LC_MESSAGES/moserial.mo share/locale/nb/LC_MESSAGES/moserial.mo +share/locale/pl/LC_MESSAGES/moserial.mo share/locale/pt_BR/LC_MESSAGES/moserial.mo share/locale/ro/LC_MESSAGES/moserial.mo share/locale/sl/LC_MESSAGES/moserial.mo