From 594ad9b5f094bef7a35de513ce40274d68031203 Mon Sep 17 00:00:00 2001 From: dp67 Date: Jan 03 2012 06:08:27 +0000 Subject: fldigi finally builds for Rawhide --- diff --git a/.gitignore b/.gitignore index 158cd94..3bdf1ab 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ fldigi-3.20.20.tar.gz /fldigi-3.21.9.tar.gz /fldigi-3.21.11.tar.gz /fldigi-3.21.16.tar.gz +/fldigi-3.21.34.tar.gz diff --git a/fldigi-3.21.11-global.cxx.patch b/fldigi-3.21.11-global.cxx.patch deleted file mode 100644 index cc75955..0000000 --- a/fldigi-3.21.11-global.cxx.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff -up ./src/globals/globals.cxx.old ./src/globals/globals.cxx ---- ./src/globals/globals.cxx.old 2011-06-09 17:12:59.000000000 -0400 -+++ ./src/globals/globals.cxx 2011-06-12 00:20:44.546248229 -0400 -@@ -112,7 +112,10 @@ const struct mode_info_t mode_info[NUM_M - - { MODE_SSB, &ssb_modem, "SSB", "SSB", "", "SSB", "" }, - { MODE_WWV, &wwv_modem, "WWV", "WWV", "", "", "" }, -- { MODE_ANALYSIS, &anal_modem, "ANALYSIS", _("Freq Analysis"), "", "", "" } -+ // N.B. it is not valid to use an _("NLS") string in this table!! -+ // ... doing so will break the Fl_menu_item table 'menu_'. -Kamal -+ // { MODE_ANALYSIS, &anal_modem, "ANALYSIS", _("Freq Analysis"), "", "", "" } -+ { MODE_ANALYSIS, &anal_modem, "ANALYSIS", "Freq Analysis", "", "", "" } - }; - - std::ostream& operator<<(std::ostream& s, const qrg_mode_t& m) diff --git a/fldigi-3.21.11-panel.cxx.patch b/fldigi-3.21.11-panel.cxx.patch deleted file mode 100644 index 65e0817..0000000 --- a/fldigi-3.21.11-panel.cxx.patch +++ /dev/null @@ -1,59 +0,0 @@ -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 0577e01..0379ade 100755 --- a/fldigi.spec +++ b/fldigi.spec @@ -1,11 +1,12 @@ Name: fldigi -Version: 3.21.16 +Version: 3.21.34 Release: 2%{?dist} Summary: Digital modem program for Linux Group: Applications/Communications License: GPLv3+ URL: http://www.w1hkj.com/Fldigi.html -Source0: http://www.w1hkj.com/downloads/%{name}/%{name}-%{version}.tar.gz +Source0: http://www.w1hkj.com/alpha/%{name}/%{name}-%{version}.tar.gz +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: hamlib-devel BuildRequires: fltk-devel @@ -44,11 +45,13 @@ exported by fldigi, and also defines some useful commands of its own. # Fix spurious executeable chmod 644 ./src/olivia/olivia.cxx + %build %configure make -k %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" LIBS="-lm -lX11 -lpthread" %install +rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT desktop-file-install --vendor="" \ --dir=${RPM_BUILD_ROOT}%{_datadir}/applications \ @@ -63,6 +66,9 @@ $RPM_BUILD_ROOT%{_datadir}/applications/flarq.desktop # Remove INSTALL file has no relevance to Fedora package install. rm INSTALL +%clean +rm -rf $RPM_BUILD_ROOT + %files -f %{name}.lang %defattr(-,root,root,-) %doc AUTHORS ChangeLog COPYING README NEWS @@ -76,11 +82,16 @@ rm INSTALL %attr(0644,root,root) %{_datadir}/applications/flarq.desktop %changelog -* Tue Dec 06 2011 Adam Jackson - 3.21.16-2 -- Rebuild for new libpng - -* Tue Oct 11 2011 Peter Robinson - 3.21.16-1 -- Update to 3.21.16 and cleanup spec file +* Mon Jan 2 2012 Randall J. Berry, N3LRX - 3.21.34-2 +- Test Build Against FLTK 1.3 +* Thu Dec 28 2011 Randall J. Berry - 3.21.34-1 +- Test Build Against FLTK 1.3 +- Remove patches +* Fri Sep 9 2011 Randall J. Berry - 3.21.14-2 +- Testing apply patches for panel.cxx +* Fri Sep 9 2011 Randall J. Berry - 3.21.14-1 +- Upstream update to 3.21.14 +- Remove patch applied upstream * Sun Jun 12 2011 Randall J. Berry - 3.21.11-4 - Correct my mistake in update request. * Sun Jun 12 2011 Randall J. Berry - 3.21.11-4 diff --git a/sources b/sources index aff042f..c65d314 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -9af31f9ea08dd3ad7267b72c968965f8 fldigi-3.21.16.tar.gz +a10705cd68c3f0a58f73bab3fc2492fb fldigi-3.21.34.tar.gz