[gtkterm] upgrade to 0.99.7-rc1 + some fixes from git
Hans de Goede
jwrdegoede at fedoraproject.org
Thu May 2 13:48:22 UTC 2013
commit 836113212607c1ed7f28f4d21cb079fa73c4d6ae
Author: Hans de Goede <hdegoede at redhat.com>
Date: Thu May 2 15:52:07 2013 +0200
upgrade to 0.99.7-rc1 + some fixes from git
- run autoreconf for aarch64 support (rhbz#925523)
.gitignore | 1 +
...cimal-handle-more-then-50-chars-and-impro.patch | 55 ++++++++++++
gtkterm-0.99.5-scrollback.patch | 87 --------------------
gtkterm-0.99.6-ubuntu-fixes.patch | 49 -----------
gtkterm.spec | 39 ++++-----
sources | 2 +-
6 files changed, 76 insertions(+), 157 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index c6536f1..182202b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@ gtkterm-0.99.5.tar.gz
gtkterm.png
/gtkterm-0.99.6.tar.gz
/gtkterm.png
+/gtkterm-26021e331031902291f7f4c88dbb662ece3f6bd3.tar.bz2
diff --git a/0001-Send_Hexadecimal-handle-more-then-50-chars-and-impro.patch b/0001-Send_Hexadecimal-handle-more-then-50-chars-and-impro.patch
new file mode 100644
index 0000000..672023c
--- /dev/null
+++ b/0001-Send_Hexadecimal-handle-more-then-50-chars-and-impro.patch
@@ -0,0 +1,55 @@
+From 80e5480ac158eaa88696619b105dec6b7555e693 Mon Sep 17 00:00:00 2001
+From: Hans de Goede <hdegoede at redhat.com>
+Date: Thu, 2 May 2013 15:44:05 +0200
+Subject: [PATCH] Send_Hexadecimal: handle more then 50 chars and improve error
+ reporting
+
+Signed-off-by: Hans de Goede <hdegoede at redhat.com>
+---
+ src/widgets.c | 20 +++++++++++++-------
+ 1 file changed, 13 insertions(+), 7 deletions(-)
+
+diff --git a/src/widgets.c b/src/widgets.c
+index d71c6ad..5865323 100644
+--- a/src/widgets.c
++++ b/src/widgets.c
+@@ -643,8 +643,8 @@ void show_message(gchar *message, gint type_msg)
+
+ gboolean Send_Hexadecimal(GtkWidget *widget, GdkEventKey *event, gpointer pointer)
+ {
+- guint i, j = 0;
+- gchar *text, *message, **tokens, buff[50];
++ guint i;
++ gchar *text, *message, **tokens, *buff;
+ guint scan_val;
+
+ text = (gchar *)gtk_entry_get_text(GTK_ENTRY(widget));
+@@ -658,14 +658,20 @@ gboolean Send_Hexadecimal(GtkWidget *widget, GdkEventKey *event, gpointer pointe
+ }
+
+ tokens = g_strsplit_set(text, " ;", -1);
+-
+- for(i = 0; tokens[i] != NULL && j < 50; i++){
+- if(sscanf(tokens[i], "%02X", &scan_val) == 1){
+- buff[j++] = scan_val;
++ buff = g_malloc(g_strv_length(tokens));
++
++ for(i = 0; tokens[i] != NULL; i++){
++ if(sscanf(tokens[i], "%02X", &scan_val) != 1){
++ Put_temp_message(_("Improper formatted hex input, 0 bytes sent!"),
++ 1500);
++ g_free(buff);
++ return FALSE;
+ }
++ buff[i] = scan_val;
+ }
+
+- send_serial(buff, j);
++ send_serial(buff, i);
++ g_free(buff);
+
+ message = g_strdup_printf(_("%d byte(s) sent!"), i);
+ Put_temp_message(message, 2000);
+--
+1.8.2.1
+
diff --git a/gtkterm.spec b/gtkterm.spec
index 27297cb..c78a0e0 100644
--- a/gtkterm.spec
+++ b/gtkterm.spec
@@ -1,18 +1,17 @@
Name: gtkterm
-Version: 0.99.6
-Release: 7%{?dist}
+Version: 0.99.7
+Release: 0.1.rc1.git26021e33%{?dist}
Summary: Serial port terminal
Group: Applications/Communications
License: GPLv2+
URL: https://fedorahosted.org/gtkterm/
-Source0: https://fedorahosted.org/released/gtkterm/%{name}-%{version}.tar.gz
+#Source0: https://fedorahosted.org/released/gtkterm/%{name}-%{version}.tar.gz
+Source0: https://git.fedorahosted.org/cgit/gtkterm.git/snapshot/gtkterm-26021e331031902291f7f4c88dbb662ece3f6bd3.tar.bz2
Source1: gtkterm.desktop
Source2: gtkterm.png
-Patch0: gtkterm-0.99.5-scrollback.patch
-Patch1: gtkterm-0.99.6-ubuntu-fixes.patch
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: gtk2-devel gettext bison desktop-file-utils vte-devel
-BuildRequires: zlib-devel ncurses-devel
+Patch0: 0001-Send_Hexadecimal-handle-more-then-50-chars-and-impro.patch
+BuildRequires: gtk2-devel gettext-devel bison desktop-file-utils vte-devel
+BuildRequires: zlib-devel ncurses-devel libtool
Requires: hicolor-icon-theme
%description
@@ -21,25 +20,26 @@ Similar to minicom or hyperterminal.
%prep
-%setup -q
+%setup -q -n gtkterm-26021e331031902291f7f4c88dbb662ece3f6bd3
%patch0 -p1
-%patch1 -p1
+# Both for aarch64 support and because we're using a git snapshot
+autoreconf -i -f
%build
%configure
-# Hack fix broken Makefile
-sed -i 's|@MKINSTALLDIRS@|../mkinstalldirs|g' po/Makefile
make %{?_smp_mflags}
%install
-rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT
+%make_install
# below is the desktop file and icon stuff.
mkdir $RPM_BUILD_ROOT%{_datadir}/applications
desktop-file-install \
+%if 0%{?fedora} && 0%{?fedora} < 19
+ --vendor fedora \
+%endif
--dir $RPM_BUILD_ROOT%{_datadir}/applications \
%{SOURCE1}
mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps
@@ -49,10 +49,6 @@ install -p -m 644 %{SOURCE2} \
%find_lang %{name}
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-
%post
touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
@@ -67,7 +63,6 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%files -f %{name}.lang
-%defattr(-,root,root,-)
%doc AUTHORS COPYING ChangeLog NEWS README TODO
%{_bindir}/%{name}
%{_mandir}/man1/%{name}.1.gz
@@ -76,6 +71,10 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%changelog
+* Thu May 2 2013 Hans de Goede <hdegoede at redhat.com> - 0.99.7-0.1.rc1.git26021e33
+- upgrade to 0.99.7-rc1 + some fixes from git
+- run autoreconf for aarch64 support (rhbz#925523)
+
* Tue Apr 23 2013 Jon Ciesla <limburgher at gmail.com> - 0.99.6-7
- Drop desktop vendor tag.
@@ -138,7 +137,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
- Taking over as new FE maintainer
- Bump to new upstream 0.99.5
-* Fri Apr 7 2005 Michael Schwendt <mschwendt[AT]users.sf.net>
+* Thu Apr 7 2005 Michael Schwendt <mschwendt[AT]users.sf.net>
- rebuilt
* Fri Nov 28 2003 Nils O. Selåsdal <NOS at Utel.no> - 0:0.99.4-0.fdr.3
diff --git a/sources b/sources
index 369e199..d532238 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
9e25fa8914f415a1d9f6d60801752b6a gtkterm.png
-49fca8132e36781378c1f5c6b60291cb gtkterm-0.99.6.tar.gz
+ae50bbbab87f0dad7c8d90bf3ed078c9 gtkterm-26021e331031902291f7f4c88dbb662ece3f6bd3.tar.bz2
More information about the scm-commits
mailing list