[fldigi] commit patched source
Randall 'Randy' Berry
dp67 at fedoraproject.org
Tue Jun 14 07:49:30 UTC 2011
commit 30c8c73701c39b368c70c2005d0135cd0b7d8a3f
Author: dp67 <dp67 at fedoraproject.org>
Date: Tue Jun 14 03:49:17 2011 -0400
commit patched source
fldigi-3.21.11-panel.cxx.patch | 59 ++++++++++++++++++++++++++++++++++++++++
fldigi.spec | 8 ++++-
2 files changed, 65 insertions(+), 2 deletions(-)
---
diff --git a/fldigi-3.21.11-panel.cxx.patch b/fldigi-3.21.11-panel.cxx.patch
new file mode 100644
index 0000000..65e0817
--- /dev/null
+++ b/fldigi-3.21.11-panel.cxx.patch
@@ -0,0 +1,59 @@
+diff -up ./src/widgets/Panel.cxx.diff ./src/widgets/Panel.cxx
+--- ./src/widgets/Panel.cxx.diff 2011-06-09 17:12:59.000000000 -0400
++++ ./src/widgets/Panel.cxx 2011-06-13 19:50:26.917248890 -0400
+@@ -9,7 +9,7 @@
+ // Fldigi is free software: you can redistribute it and/or modify
+ // it under the terms of the GNU General Public License as published by
+ // the Free Software Foundation, either version 3 of the License, or
+-// (at your option) aRY later version.
++// (at your option) any later version.
+ //
+ // Fldigi is distributed in the hope that it will be useful,
+ // but WITHOUT ARY WARRANTY; without even the implied warranty of
+@@ -37,7 +37,7 @@
+ int Panel::orgx()
+ {
+ int oldx = w();
+- short* p = sizes()+8;
++ int* p = sizes()+8;
+ for (int i=children(); i--; p += 4)
+ if (p[1] < oldx) oldx = p[1];
+ return oldx;
+@@ -46,7 +46,7 @@ int Panel::orgx()
+ int Panel::orgy()
+ {
+ int oldy = h();
+- short* p = sizes()+8;
++ int* p = sizes()+8;
+ for (int i=children(); i--; p += 4)
+ if (p[3] < oldy) oldy = p[3];
+ return oldy;
+@@ -55,7 +55,7 @@ int Panel::orgy()
+ void Panel::position(int oix, int oiy, int newx, int newy) {
+ //printf("oix %3d, oiy %3d, nux %3d, nuy %3d\n", oix, oiy, newx, newy);
+ Fl_Widget* const* a = array();
+- short* p = sizes();
++ int* p = sizes();
+ //printf("p0 %3d, p1 %3d, p2 %3d, p3 %3d\n", p[0], p[1], p[2], p[3]);
+ //printf("p4 %3d, p5 %3d, p6 %3d, p7 %3d\n", p[0], p[1], p[2], p[3]);
+ p += 8; // skip group & resizable's saved size
+@@ -90,7 +90,7 @@ void Panel::position(int oix, int oiy, i
+ // move the lower-right corner (sort of):
+ void Panel::resize(int X,int Y,int W,int H) {
+ // remember how much to move the child widgets:
+- short* p = sizes();
++ int* p = sizes();
+ int OX = x();
+ int OY = y();
+ int OW = w();
+@@ -191,8 +191,8 @@ int Panel::handle(int event) {
+ int oldx = 0;
+ int oldy = 0;
+ Fl_Widget*const* a = array();
+- short* q = sizes();
+- short* p = q+8;
++ int* q = sizes();
++ int* p = q+8;
+ for (int i=children(); i--; p += 4) {
+ Fl_Widget* o = *a++;
+ if (o == resizable()) continue;
diff --git a/fldigi.spec b/fldigi.spec
index 2007d89..a29922e 100755
--- a/fldigi.spec
+++ b/fldigi.spec
@@ -1,14 +1,17 @@
Name: fldigi
Version: 3.21.11
-Release: 5%{?dist}
+Release: 6%{?dist}
Summary: Digital modem program for Linux
Group: Applications/Communications
License: GPLv3+
URL: http://www.w1hkj.com/Fldigi.html
Source0: http://www.w1hkj.com/alpha/%{name}/%{name}-%{version}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-# Patch By Kamal Mostafa, KA6MAL Fixes #708696 "Fldigi crashes when started" reported upstream.
+
+# Patch0 By Kamal Mostafa, KA6MAL Fixes #708696 "Fldigi crashes when started" reported upstream.
Patch0: %{name}-%{version}-global.cxx.patch
+# Patch1 recomended by Dave Feese, W1HKJ
+Patch1: %{name}-%{version}-panel.cxx.patch
BuildRequires: hamlib-devel
BuildRequires: fltk-devel
@@ -47,6 +50,7 @@ exported by fldigi, and also defines some useful commands of its own.
# Fix spurious executeable
chmod 644 ./src/olivia/olivia.cxx
%patch0 -p1 -b %{name}-%{version}-global.cxx.patch
+%patch1 -p1 -b %{name}-%{version}-panel.cxx.patch
%build
%configure
More information about the scm-commits
mailing list