rpms/fldigi/F-11 fldigi-gcc44.patch,NONE,1.1 fldigi.spec,1.10,1.11
Miloš Jakubíček
mjakubicek at fedoraproject.org
Fri Apr 24 22:32:50 UTC 2009
- Previous message (by thread): rpms/kernel/devel patch-2.6.30-rc3.bz2.sign, NONE, 1.1.2.2 rds-only-on-64-bit-or-x86.patch, NONE, 1.1.10.2 .cvsignore, 1.1014.2.9, 1.1014.2.10 Makefile, 1.97.6.3, 1.97.6.4 TODO, 1.54.6.5, 1.54.6.6 branch, 1.1.2.2, 1.1.2.3 config-arm, 1.2, 1.2.6.1 config-generic, 1.238.6.16, 1.238.6.17 config-ia64-generic, 1.21.6.2, 1.21.6.3 config-nodebug, 1.31.6.1, 1.31.6.2 config-powerpc-generic, 1.33.6.4, 1.33.6.5 config-powerpc64, 1.27.6.1, 1.27.6.2 config-s390x, 1.11.6.1, 1.11.6.2 config-sparc64-generic, 1.21.6.2, 1.21.6.3 config-sparc64-smp, 1.2.16.1, 1.2.16.2 config-x86-generic, 1.68.6.6, 1.68.6.7 config-x86_64-generic, 1.68.2.6, 1.68.2.7 drm-modesetting-radeon.patch, 1.54.6.8, 1.54.6.9 drm-next.patch, 1.6.6.6, 1.6.6.7 drm-nouveau.patch, 1.8.6.9, 1.8.6.10 kernel.spec, 1.1294.2.20, 1.1294.2.21 linux-2.6-defaults-pci_no_msi.patch, 1.4, 1.4.6.1 linux-2.6-execshield.patch, 1.102.6.1, 1.102.6.2 linux-2.6-tracehook.patch, 1.8.6.2, 1.8.6.3 linux-2.6-utrace.patch, 1.107.6.1, 1.107.6.2 linux-2.6-v4l-dvb-fixes.patch, 1.2.8.8, 1.2.8.9 sources, 1.976.2.10, 1.976.2.11 upstream, 1.888.2.9, 1.888.2.10 xen.pvops.patch, 1.1.2.16, 1.1.2.17 xen.pvops.post.patch, 1.1.2.10, 1.1.2.11 xen.pvops.pre.patch, 1.1.2.9, 1.1.2.10 alsa-dont-reset-stream-at-each-prepare-callb.patch, 1.1.2.1, NONE alsa-hda-dont-reset-BDL-unnecessarily.patch, 1.1.2.1, NONE alsa-hda_intel-fix-unexpected-ring-buffer-positio.patch, 1.1.2.1, NONE alsa-pcm-always-reset-invalid-position.patch, 1.1.2.2, NONE alsa-pcm-fix-delta-calc-at-overlap.patch, 1.1.2.2, NONE alsa-pcm-midlevel-add-more-strict-buffer-position.patch, 1.1.2.1, NONE alsa-pcm-safer-boundary-checks.patch, 1.1.2.2, NONE alsa-rewrite-hw_ptr-updaters.patch, 1.1.2.2, NONE drm-intel-gen3-fb-hack.patch, 1.1.2.1, NONE drm-intel-lying-systems-without-lvds.patch, 1.1.2.1, NONE linux-2.6-acer-wmi-bail-on-aao.patch, 1.1.2.1, NONE linux-2.6-acpi-strict-resources.patch, 1.1, NONE linux-2.6-acpi-video-didl-intel-outputs.patch, 1.1.2.4, NONE linux-2.6-add-qcserial.patch, 1.1.2.1, NONE linux-2.6-btrfs-fix-umount-hang.patch, 1.2.2.2, NONE linux-2.6-dma-debug-fixes.patch, 1.1.2.1, NONE linux-2.6-dropwatch-protocol.patch, 1.1.2.2, NONE linux-2.6-e820-acpi3-bios-workaround.patch, 1.1.2.1, NONE linux-2.6-e820-guard-against-pre-acpi3.patch, 1.1.2.1, NONE linux-2.6-e820-mark-esi-clobbered.patch, 1.1.2.1, NONE linux-2.6-e820-save-restore-edi-ebp.patch, 1.1.2.1, NONE linux-2.6-ext4-flush-on-close.patch, 1.1.2.2, NONE linux-2.6-ext4-really-print-warning-once.patch, 1.1.2.1, NONE linux-2.6-fiemap-header-install.patch, 1.2.2.2, NONE linux-2.6-hwmon-atk0110.patch, 1.2, NONE linux-2.6-input-hid-extra-gamepad.patch, 1.1.2.2, NONE linux-2.6-input-wacom-bluetooth.patch, 1.1.2.1, NONE linux-2.6-iommu-fixes.patch, 1.1.2.1, NONE linux-2.6-ipw2x00-age-scan-results-on-resume.patch, 1.1.10.2, NONE linux-2.6-iwl3945-report-killswitch-changes-even-if-the-interface-is-down.patch, 1.1.2.1, NONE linux-2.6-iwlagn-fix-hw-rfkill-while-the-interface-is-down.patch, 1.1.2.1, NONE linux-2.6-kvm-kconfig-irqchip.patch, 1.1.2.1, NONE linux-2.6-kvm-mask-notifiers.patch, 1.1.2.1, NONE linux-2.6-kvm-reset-pit-irq-on-unmask.patch, 1.1.2.1, NONE linux-2.6-md-raid1-dont-assume-new-bvecs-are-init.patch, 1.1.2.1, NONE linux-2.6-mm-define-unique-value-for-as_unevictable.patch, 1.1.2.1, NONE linux-2.6-net-fix-another-gro-bug.patch, 1.1.2.2, NONE linux-2.6-pci-sysfs-remove-id.patch, 1.1.6.2, NONE linux-2.6-posix-timers-fix-clock-monotonicity.patch, 1.1.2.1, NONE linux-2.6-posix-timers-fix-rlimit_cpu-fork-2.patch, 1.1.2.1, NONE linux-2.6-posix-timers-fix-rlimit_cpu-fork.patch, 1.1.2.1, NONE linux-2.6-posix-timers-fix-rlimit_cpu-setitimer.patch, 1.1.2.1, NONE linux-2.6-relatime-by-default.patch, 1.1.2.2, NONE linux-2.6-scsi-cpqarray-set-master.patch, 1.1, NONE linux-2.6-shut-up-efifb.patch, 1.1.2.1, NONE linux-2.6-sony-laptop-rfkill.patch, 1.2.6.3, NONE linux-2.6-usb-cdc-acm-remove-low-latency-flag.patch, 1.1.2.1, NONE linux-2.6-utrace-ftrace.patch, 1.2.6.2, NONE linux-2.6-v4l-dvb-fix-uint16_t-audio-h.patch, 1.1.2.1, NONE linux-2.6-v4l-pvrusb2-fixes.patch, 1.1.2.2, NONE linux-2.6.29-alsa-update-quirks.patch, 1.1.2.1, NONE linux-2.6.29.1-sparc-regression.patch, 1.1.2.1, NONE patch-2.6.29.1.bz2.sign, 1.1.2.1, NONE revert-fix-modules_install-via-nfs.patch, 1.1, NONE squashfs-broken-when-pagesize-greater-than-blocksize.patch, 1.1.2.1, NONE
- Next message (by thread): rpms/fldigi/devel fldigi-gcc44.patch, NONE, 1.1 fldigi.spec, 1.10, 1.11
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: mjakubicek
Update of /cvs/pkgs/rpms/fldigi/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10448/F-11
Modified Files:
fldigi.spec
Added Files:
fldigi-gcc44.patch
Log Message:
- Fix FTBFS: added fldigi-gcc44.patch
fldigi-gcc44.patch:
--- NEW FILE fldigi-gcc44.patch ---
--- src/dialogs/font_browser.cxx.orig 2009-04-25 00:03:42.000000000 +0200
+++ src/dialogs/font_browser.cxx 2009-04-25 00:03:49.000000000 +0200
@@ -32,6 +32,7 @@
#include <string>
#include <cstdlib>
#include <cstring>
+#include <cstdio>
#include "font_browser.h"
--- src/misc/qrzlib.cxx.orig 2009-04-25 00:11:54.000000000 +0200
+++ src/misc/qrzlib.cxx 2009-04-25 00:13:06.000000000 +0200
@@ -775,44 +775,44 @@
if( found == 1 ) {
Qcall = recbuffer;
- comma = strchr( Qcall, ',' );
+ comma = (char *) strchr( Qcall, ',' );
*comma = 0;
Qlname = comma + 1;
- comma = strchr( Qlname, ',' );
+ comma = (char *) strchr( Qlname, ',' );
*comma = 0;
Qfname = comma + 1;
- comma = strchr( Qfname, ',' );
+ comma = (char *) strchr( Qfname, ',' );
Qfname = comma + 1; // skip JR field
- comma = strchr( Qfname, ',' );
+ comma = (char *) strchr( Qfname, ',' );
*comma = 0;
Qdob = comma + 1;
- comma = strchr( Qdob, ',' );
+ comma = (char *) strchr( Qdob, ',' );
Qdob = comma + 1; // skip MI field
- comma = strchr( Qdob, ',' );
+ comma = (char *) strchr( Qdob, ',' );
*comma = 0;
Qefdate = comma + 1;
- comma = strchr( Qefdate, ',' );
+ comma = (char *) strchr( Qefdate, ',' );
*comma = 0;
Qexpdate = comma + 1;
- comma = strchr( Qexpdate, ',' );
+ comma = (char *) strchr( Qexpdate, ',' );
*comma = 0;
Qmail_str = comma + 1;
- comma = strchr( Qmail_str, ',' );
+ comma = (char *) strchr( Qmail_str, ',' );
*comma = 0;
Qmail_city = comma + 1;
- comma = strchr( Qmail_city, ',' );
+ comma = (char *) strchr( Qmail_city, ',' );
*comma = 0;
Qmail_st = comma + 1;
- comma = strchr( Qmail_st, ',' );
+ comma = (char *) strchr( Qmail_st, ',' );
*comma = 0;
Qmail_zip = comma + 1;
- comma = strchr( Qmail_zip, ',' );
+ comma = (char *) strchr( Qmail_zip, ',' );
*comma = 0;
Qopclass = comma + 1;
- comma = strchr( Qopclass, ',' );
+ comma = (char *) strchr( Qopclass, ',' );
*comma = 0;
Qp_call = comma + 1;
- comma = strchr( Qp_call, ',' );
+ comma = (char *) strchr( Qp_call, ',' );
*comma = 0;
Qp_class = comma + 1;
//Qp_class[1] = 0;
--- src/widgets/picture.cxx.orig 2009-04-25 00:17:36.000000000 +0200
+++ src/widgets/picture.cxx 2009-04-25 00:17:51.000000000 +0200
@@ -384,7 +384,7 @@
if (strstr(text, "file://"))
text += strlen("file://");
char* p;
- if ((p = strchr(text, '\r')))
+ if ((p = (char *) strchr(text, '\r')))
*p = '\0';
struct stat st;
--- src/misc/socket.cxx.orig 2009-04-25 00:13:57.000000000 +0200
+++ src/misc/socket.cxx 2009-04-25 00:19:03.000000000 +0200
@@ -39,6 +39,7 @@
#include <cstring>
#include <cstdlib>
#include <cmath>
+#include <stdio.h>
#ifndef NDEBUG
#include "debug.h"
Index: fldigi.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fldigi/F-11/fldigi.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- fldigi.spec 24 Feb 2009 17:28:01 -0000 1.10
+++ fldigi.spec 24 Apr 2009 22:32:20 -0000 1.11
@@ -1,12 +1,14 @@
Name: fldigi
Version: 3.10
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: Digital modem program for Linux
Group: Applications/Communications
License: GPLv2+
URL: http://www.w1hkj.com/fldigi-distro/
Source0: http://www.w1hkj.com/fldigi-distro/%{name}-%{version}.tar.gz
+# The package should be updated to current, patch re-diffed and send upstream!
+Patch0: %{name}-gcc44.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: hamlib-devel, fltk-devel, libjpeg-devel, libpng-devel
@@ -22,10 +24,11 @@
%prep
%setup -q
+%patch0
%build
%configure
-make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS"
+make -k %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS"
%install
rm -rf $RPM_BUILD_ROOT
@@ -48,6 +51,9 @@
%attr(0644,root,root) %{_datadir}/applications/%{name}.desktop
%changelog
+* Sat Apr 25 2009 Milos Jakubicek <xjakub at fi.muni.cz> - 3.10-3
+- Fix FTBFS: added fldigi-gcc44.patch
+
* Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.10-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
- Previous message (by thread): rpms/kernel/devel patch-2.6.30-rc3.bz2.sign, NONE, 1.1.2.2 rds-only-on-64-bit-or-x86.patch, NONE, 1.1.10.2 .cvsignore, 1.1014.2.9, 1.1014.2.10 Makefile, 1.97.6.3, 1.97.6.4 TODO, 1.54.6.5, 1.54.6.6 branch, 1.1.2.2, 1.1.2.3 config-arm, 1.2, 1.2.6.1 config-generic, 1.238.6.16, 1.238.6.17 config-ia64-generic, 1.21.6.2, 1.21.6.3 config-nodebug, 1.31.6.1, 1.31.6.2 config-powerpc-generic, 1.33.6.4, 1.33.6.5 config-powerpc64, 1.27.6.1, 1.27.6.2 config-s390x, 1.11.6.1, 1.11.6.2 config-sparc64-generic, 1.21.6.2, 1.21.6.3 config-sparc64-smp, 1.2.16.1, 1.2.16.2 config-x86-generic, 1.68.6.6, 1.68.6.7 config-x86_64-generic, 1.68.2.6, 1.68.2.7 drm-modesetting-radeon.patch, 1.54.6.8, 1.54.6.9 drm-next.patch, 1.6.6.6, 1.6.6.7 drm-nouveau.patch, 1.8.6.9, 1.8.6.10 kernel.spec, 1.1294.2.20, 1.1294.2.21 linux-2.6-defaults-pci_no_msi.patch, 1.4, 1.4.6.1 linux-2.6-execshield.patch, 1.102.6.1, 1.102.6.2 linux-2.6-tracehook.patch, 1.8.6.2, 1.8.6.3 linux-2.6-utrace.patch, 1.107.6.1, 1.107.6.2 linux-2.6-v4l-dvb-fixes.patch, 1.2.8.8, 1.2.8.9 sources, 1.976.2.10, 1.976.2.11 upstream, 1.888.2.9, 1.888.2.10 xen.pvops.patch, 1.1.2.16, 1.1.2.17 xen.pvops.post.patch, 1.1.2.10, 1.1.2.11 xen.pvops.pre.patch, 1.1.2.9, 1.1.2.10 alsa-dont-reset-stream-at-each-prepare-callb.patch, 1.1.2.1, NONE alsa-hda-dont-reset-BDL-unnecessarily.patch, 1.1.2.1, NONE alsa-hda_intel-fix-unexpected-ring-buffer-positio.patch, 1.1.2.1, NONE alsa-pcm-always-reset-invalid-position.patch, 1.1.2.2, NONE alsa-pcm-fix-delta-calc-at-overlap.patch, 1.1.2.2, NONE alsa-pcm-midlevel-add-more-strict-buffer-position.patch, 1.1.2.1, NONE alsa-pcm-safer-boundary-checks.patch, 1.1.2.2, NONE alsa-rewrite-hw_ptr-updaters.patch, 1.1.2.2, NONE drm-intel-gen3-fb-hack.patch, 1.1.2.1, NONE drm-intel-lying-systems-without-lvds.patch, 1.1.2.1, NONE linux-2.6-acer-wmi-bail-on-aao.patch, 1.1.2.1, NONE linux-2.6-acpi-strict-resources.patch, 1.1, NONE linux-2.6-acpi-video-didl-intel-outputs.patch, 1.1.2.4, NONE linux-2.6-add-qcserial.patch, 1.1.2.1, NONE linux-2.6-btrfs-fix-umount-hang.patch, 1.2.2.2, NONE linux-2.6-dma-debug-fixes.patch, 1.1.2.1, NONE linux-2.6-dropwatch-protocol.patch, 1.1.2.2, NONE linux-2.6-e820-acpi3-bios-workaround.patch, 1.1.2.1, NONE linux-2.6-e820-guard-against-pre-acpi3.patch, 1.1.2.1, NONE linux-2.6-e820-mark-esi-clobbered.patch, 1.1.2.1, NONE linux-2.6-e820-save-restore-edi-ebp.patch, 1.1.2.1, NONE linux-2.6-ext4-flush-on-close.patch, 1.1.2.2, NONE linux-2.6-ext4-really-print-warning-once.patch, 1.1.2.1, NONE linux-2.6-fiemap-header-install.patch, 1.2.2.2, NONE linux-2.6-hwmon-atk0110.patch, 1.2, NONE linux-2.6-input-hid-extra-gamepad.patch, 1.1.2.2, NONE linux-2.6-input-wacom-bluetooth.patch, 1.1.2.1, NONE linux-2.6-iommu-fixes.patch, 1.1.2.1, NONE linux-2.6-ipw2x00-age-scan-results-on-resume.patch, 1.1.10.2, NONE linux-2.6-iwl3945-report-killswitch-changes-even-if-the-interface-is-down.patch, 1.1.2.1, NONE linux-2.6-iwlagn-fix-hw-rfkill-while-the-interface-is-down.patch, 1.1.2.1, NONE linux-2.6-kvm-kconfig-irqchip.patch, 1.1.2.1, NONE linux-2.6-kvm-mask-notifiers.patch, 1.1.2.1, NONE linux-2.6-kvm-reset-pit-irq-on-unmask.patch, 1.1.2.1, NONE linux-2.6-md-raid1-dont-assume-new-bvecs-are-init.patch, 1.1.2.1, NONE linux-2.6-mm-define-unique-value-for-as_unevictable.patch, 1.1.2.1, NONE linux-2.6-net-fix-another-gro-bug.patch, 1.1.2.2, NONE linux-2.6-pci-sysfs-remove-id.patch, 1.1.6.2, NONE linux-2.6-posix-timers-fix-clock-monotonicity.patch, 1.1.2.1, NONE linux-2.6-posix-timers-fix-rlimit_cpu-fork-2.patch, 1.1.2.1, NONE linux-2.6-posix-timers-fix-rlimit_cpu-fork.patch, 1.1.2.1, NONE linux-2.6-posix-timers-fix-rlimit_cpu-setitimer.patch, 1.1.2.1, NONE linux-2.6-relatime-by-default.patch, 1.1.2.2, NONE linux-2.6-scsi-cpqarray-set-master.patch, 1.1, NONE linux-2.6-shut-up-efifb.patch, 1.1.2.1, NONE linux-2.6-sony-laptop-rfkill.patch, 1.2.6.3, NONE linux-2.6-usb-cdc-acm-remove-low-latency-flag.patch, 1.1.2.1, NONE linux-2.6-utrace-ftrace.patch, 1.2.6.2, NONE linux-2.6-v4l-dvb-fix-uint16_t-audio-h.patch, 1.1.2.1, NONE linux-2.6-v4l-pvrusb2-fixes.patch, 1.1.2.2, NONE linux-2.6.29-alsa-update-quirks.patch, 1.1.2.1, NONE linux-2.6.29.1-sparc-regression.patch, 1.1.2.1, NONE patch-2.6.29.1.bz2.sign, 1.1.2.1, NONE revert-fix-modules_install-via-nfs.patch, 1.1, NONE squashfs-broken-when-pagesize-greater-than-blocksize.patch, 1.1.2.1, NONE
- Next message (by thread): rpms/fldigi/devel fldigi-gcc44.patch, NONE, 1.1 fldigi.spec, 1.10, 1.11
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list