[med-svn] r18394 - in trunk/packages/edfbrowser/trunk/debian: . patches
Andreas Tille
tille at moszumanska.debian.org
Sat Oct 25 06:47:33 UTC 2014
Author: tille
Date: 2014-10-25 06:47:32 +0000 (Sat, 25 Oct 2014)
New Revision: 18394
Added:
trunk/packages/edfbrowser/trunk/debian/patches/
trunk/packages/edfbrowser/trunk/debian/patches/0001-Fixed-a-bug-that-could-possibly-cause-a-compile-erro.patch
trunk/packages/edfbrowser/trunk/debian/patches/0002-Try-to-prevent-compile-errors-on-Freebsd.patch
trunk/packages/edfbrowser/trunk/debian/patches/0003-Fixed-a-bug-with-font-setting.patch
trunk/packages/edfbrowser/trunk/debian/patches/series
Modified:
trunk/packages/edfbrowser/trunk/debian/changelog
Log:
Apply patches from upstream Git fixing freebsd build problems (and other minor issues)
Modified: trunk/packages/edfbrowser/trunk/debian/changelog
===================================================================
--- trunk/packages/edfbrowser/trunk/debian/changelog 2014-10-24 22:36:56 UTC (rev 18393)
+++ trunk/packages/edfbrowser/trunk/debian/changelog 2014-10-25 06:47:32 UTC (rev 18394)
@@ -1,3 +1,11 @@
+edfbrowser (1.54-2) unstable; urgency=medium
+
+ * Apply patches from upstream Git fixing freebsd build problems
+ (and other minor issues)
+ Closes: #765808
+
+ -- Andreas Tille <tille at debian.org> Sat, 25 Oct 2014 08:32:54 +0200
+
edfbrowser (1.54-1) unstable; urgency=medium
* New upstream version
Added: trunk/packages/edfbrowser/trunk/debian/patches/0001-Fixed-a-bug-that-could-possibly-cause-a-compile-erro.patch
===================================================================
--- trunk/packages/edfbrowser/trunk/debian/patches/0001-Fixed-a-bug-that-could-possibly-cause-a-compile-erro.patch (rev 0)
+++ trunk/packages/edfbrowser/trunk/debian/patches/0001-Fixed-a-bug-that-could-possibly-cause-a-compile-erro.patch 2014-10-25 06:47:32 UTC (rev 18394)
@@ -0,0 +1,786 @@
+From 55c5575035034e609a2e542bb2abd000be7234b3 Mon Sep 17 00:00:00 2001
+From: Teuniz <teuniz at gmail.com>
+Date: Sat, 18 Oct 2014 21:45:42 +0200
+Subject: [PATCH 1/3] Fixed a bug that could possibly cause a compile error.
+
+---
+ about_dialog.h | 2 +-
+ active_file_chooser.h | 1 +
+ adjustfiltersettings.h | 1 +
+ annotations_dock.h | 1 +
+ ascii2edf.h | 1 +
+ ascii_export.h | 1 +
+ averager_curve_wnd.h | 1 +
+ averager_dialog.h | 1 +
+ bdf2edf.h | 1 +
+ bdf_triggers.h | 1 +
+ bi9800.h | 1 +
+ biosemi2bdfplus.h | 1 +
+ check_for_updates.h | 1 +
+ colordialog.h | 1 +
+ ecg_export.h | 1 +
+ edf_annotations.h | 1 +
+ edf_compat.h | 1 +
+ edfplusd_cnv.h | 1 +
+ edit_annotation_dock.h | 1 +
+ edit_predefined_mtg.h | 1 +
+ emsa2edf.h | 1 +
+ export_annotations.h | 1 +
+ filter_dialog.h | 1 +
+ filtercurve.h | 1 +
+ fino2edf.h | 1 +
+ flywheel.h | 1 +
+ header_editor.h | 1 +
+ import_annotations.h | 1 +
+ jump_dialog.h | 1 +
+ load_montage_dialog.h | 1 +
+ mainwindow.h | 1 +
+ manscan2edf.h | 1 +
+ nexfin2edf.h | 1 +
+ nk2edf.h | 1 +
+ options_dialog.h | 1 +
+ pagetime_dialog.h | 1 +
+ popup_messagewindow.h | 1 +
+ popup_save_cancelwindow.h | 1 +
+ print_to_bdf.h | 1 +
+ print_to_edf.h | 1 +
+ raw2edf.h | 1 +
+ reduce_signals.h | 1 +
+ save_annots.h | 1 +
+ save_montage_dialog.h | 1 +
+ scp_ecg2edf.h | 1 +
+ show_actual_montage_dialog.h | 1 +
+ show_edf_hdr.h | 1 +
+ signal_chooser.h | 1 +
+ signalcurve.h | 1 +
+ signals_dialog.h | 1 +
+ special_button.h | 1 +
+ spectrum_dock.h | 1 +
+ spectrumanalyzer.h | 1 +
+ statistics_dialog.h | 1 +
+ unisens2edf.h | 1 +
+ view_montage_dialog.h | 1 +
+ viewcurve.h | 1 +
+ wav2edf.h | 1 +
+ z_score_dialog.h | 1 +
+ 59 files changed, 59 insertions(+), 1 deletion(-)
+
+diff --git a/about_dialog.h b/about_dialog.h
+index 62ff149..2d48663 100644
+--- a/about_dialog.h
++++ b/about_dialog.h
+@@ -37,6 +37,7 @@
+
+
+
++#include <QtGlobal>
+ #include <QApplication>
+ #include <QObject>
+ #include <QDialog>
+@@ -44,7 +45,6 @@
+ #include <QTextEdit>
+ #include <QHBoxLayout>
+ #include <QVBoxLayout>
+-#include <QtGlobal>
+
+ #include "global.h"
+ #include "mainwindow.h"
+diff --git a/active_file_chooser.h b/active_file_chooser.h
+index 80bdccb..d9f53aa 100644
+--- a/active_file_chooser.h
++++ b/active_file_chooser.h
+@@ -37,6 +37,7 @@
+
+
+
++#include <QtGlobal>
+ #include <QApplication>
+ #include <QObject>
+ #include <QWidget>
+diff --git a/adjustfiltersettings.h b/adjustfiltersettings.h
+index dbb4eec..959e207 100644
+--- a/adjustfiltersettings.h
++++ b/adjustfiltersettings.h
+@@ -37,6 +37,7 @@
+
+
+
++#include <QtGlobal>
+ #include <QApplication>
+ #include <QObject>
+ #include <QDialog>
+diff --git a/annotations_dock.h b/annotations_dock.h
+index d501988..4bd7dbe 100644
+--- a/annotations_dock.h
++++ b/annotations_dock.h
+@@ -37,6 +37,7 @@
+
+
+
++#include <QtGlobal>
+ #include <QApplication>
+ #include <QObject>
+ #include <QDockWidget>
+diff --git a/ascii2edf.h b/ascii2edf.h
+index 9ef6ebe..d88da9b 100644
+--- a/ascii2edf.h
++++ b/ascii2edf.h
+@@ -34,6 +34,7 @@
+ #define UI_ASCII2EDFFORM_H
+
+
++#include <QtGlobal>
+ #include <QApplication>
+ #include <QObject>
+ #include <QDialog>
+diff --git a/ascii_export.h b/ascii_export.h
+index ac22b03..23e3276 100644
+--- a/ascii_export.h
++++ b/ascii_export.h
+@@ -37,6 +37,7 @@
+
+
+
++#include <QtGlobal>
+ #include <QApplication>
+ #include <QObject>
+ #include <QFileDialog>
+diff --git a/averager_curve_wnd.h b/averager_curve_wnd.h
+index 6c119b6..18c11cf 100644
+--- a/averager_curve_wnd.h
++++ b/averager_curve_wnd.h
+@@ -36,6 +36,7 @@
+
+
+
++#include <QtGlobal>
+ #include <QApplication>
+ #include <QObject>
+ #include <QWidget>
+diff --git a/averager_dialog.h b/averager_dialog.h
+index a17edde..e989843 100644
+--- a/averager_dialog.h
++++ b/averager_dialog.h
+@@ -37,6 +37,7 @@
+
+
+
++#include <QtGlobal>
+ #include <QApplication>
+ #include <QObject>
+ #include <QListWidget>
+diff --git a/bdf2edf.h b/bdf2edf.h
+index c2bfda2..e99e735 100644
+--- a/bdf2edf.h
++++ b/bdf2edf.h
+@@ -34,6 +34,7 @@
+ #define UI_BDF2EDFFORM_H
+
+
++#include <QtGlobal>
+ #include <QApplication>
+ #include <QObject>
+ #include <QDialog>
+diff --git a/bdf_triggers.h b/bdf_triggers.h
+index 29e939e..11a35bf 100644
+--- a/bdf_triggers.h
++++ b/bdf_triggers.h
+@@ -37,6 +37,7 @@
+ #define BDF_TRIGGERS_H
+
+
++#include <QtGlobal>
+ #include <QApplication>
+ #include <QMessageBox>
+ #include <QProgressDialog>
+diff --git a/bi9800.h b/bi9800.h
+index 27c95b6..e1ef6f0 100644
+--- a/bi9800.h
++++ b/bi9800.h
+@@ -34,6 +34,7 @@
+ #define UI_BI98002EDFFORM_H
+
+
++#include <QtGlobal>
+ #include <QApplication>
+ #include <QObject>
+ #include <QDialog>
+diff --git a/biosemi2bdfplus.h b/biosemi2bdfplus.h
+index 1571c92..cee9975 100644
+--- a/biosemi2bdfplus.h
++++ b/biosemi2bdfplus.h
+@@ -34,6 +34,7 @@
+ #define UI_BIOSEMI2BDFFORM_H
+
+
++#include <QtGlobal>
+ #include <QApplication>
+ #include <QObject>
+ #include <QDialog>
+diff --git a/check_for_updates.h b/check_for_updates.h
+index 5e9ebc0..9234e88 100644
+--- a/check_for_updates.h
++++ b/check_for_updates.h
+@@ -34,6 +34,7 @@
+ #define CHECKFORUPDATES_H
+
+
++#include <QtGlobal>
+ #include <QApplication>
+ #include <QNetworkAccessManager>
+ #include <QNetworkRequest>
+diff --git a/colordialog.h b/colordialog.h
+index 4aad828..585abb4 100644
+--- a/colordialog.h
++++ b/colordialog.h
+@@ -37,6 +37,7 @@
+
+
+
++#include <QtGlobal>
+ #include <QApplication>
+ #include <QObject>
+ #include <QWidget>
+diff --git a/ecg_export.h b/ecg_export.h
+index f3e2135..7a8b147 100644
+--- a/ecg_export.h
++++ b/ecg_export.h
+@@ -37,6 +37,7 @@
+
+
+
++#include <QtGlobal>
+ #include <QApplication>
+ #include <QObject>
+ #include <QDialog>
+diff --git a/edf_annotations.h b/edf_annotations.h
+index c1098f4..140e108 100644
+--- a/edf_annotations.h
++++ b/edf_annotations.h
+@@ -37,6 +37,7 @@
+ #define EDF_ANNOTATIONS_H
+
+
++#include <QtGlobal>
+ #include <QApplication>
+ #include <QMessageBox>
+ #include <QProgressDialog>
+diff --git a/edf_compat.h b/edf_compat.h
+index e7b0dd0..6b87001 100644
+--- a/edf_compat.h
++++ b/edf_compat.h
+@@ -37,6 +37,7 @@
+
+
+
++#include <QtGlobal>
+ #include <QApplication>
+ #include <QObject>
+ #include <QDialog>
+diff --git a/edfplusd_cnv.h b/edfplusd_cnv.h
+index f6bb324..b2d8a67 100644
+--- a/edfplusd_cnv.h
++++ b/edfplusd_cnv.h
+@@ -34,6 +34,7 @@
+ #define UI_EDFD2EDFCFORM_H
+
+
++#include <QtGlobal>
+ #include <QApplication>
+ #include <QDialog>
+ #include <QPushButton>
+diff --git a/edit_annotation_dock.h b/edit_annotation_dock.h
+index 5286466..8a8b3e8 100644
+--- a/edit_annotation_dock.h
++++ b/edit_annotation_dock.h
+@@ -37,6 +37,7 @@
+
+
+
++#include <QtGlobal>
+ #include <QApplication>
+ #include <QObject>
+ #include <QDockWidget>
+diff --git a/edit_predefined_mtg.h b/edit_predefined_mtg.h
+index 7a1e70a..9755ae4 100644
+--- a/edit_predefined_mtg.h
++++ b/edit_predefined_mtg.h
+@@ -37,6 +37,7 @@
+
+
+
++#include <QtGlobal>
+ #include <QApplication>
+ #include <QObject>
+ #include <QFileDialog>
+diff --git a/emsa2edf.h b/emsa2edf.h
+index ee545dd..6f47718 100644
+--- a/emsa2edf.h
++++ b/emsa2edf.h
+@@ -34,6 +34,7 @@
+ #define UI_EMSA2EDFFORM_H
+
+
++#include <QtGlobal>
+ #include <QApplication>
+ #include <QDialog>
+ #include <QPushButton>
+diff --git a/export_annotations.h b/export_annotations.h
+index fba0638..2780337 100644
+--- a/export_annotations.h
++++ b/export_annotations.h
+@@ -37,6 +37,7 @@
+
+
+
++#include <QtGlobal>
+ #include <QApplication>
+ #include <QObject>
+ #include <QFileDialog>
+diff --git a/filter_dialog.h b/filter_dialog.h
+index 1f0a92a..15ecfe5 100644
+--- a/filter_dialog.h
++++ b/filter_dialog.h
+@@ -37,6 +37,7 @@
+
+
+
++#include <QtGlobal>
+ #include <QApplication>
+ #include <QObject>
+ #include <QListWidget>
+diff --git a/filtercurve.h b/filtercurve.h
+index 907411b..207e23b 100644
+--- a/filtercurve.h
++++ b/filtercurve.h
+@@ -35,6 +35,7 @@
+ #define FILTERCURVE_H
+
+
++#include <QtGlobal>
+ #include <QWidget>
+ #include <QPainter>
+ #include <QPen>
+diff --git a/fino2edf.h b/fino2edf.h
+index a960925..6dcf0d8 100644
+--- a/fino2edf.h
++++ b/fino2edf.h
+@@ -34,6 +34,7 @@
+ #define UI_FINO2EDFFORM_H
+
+
++#include <QtGlobal>
+ #include <QApplication>
+ #include <QDialog>
+ #include <QLabel>
+diff --git a/flywheel.h b/flywheel.h
+index 295e6e8..e1185ea 100644
+--- a/flywheel.h
++++ b/flywheel.h
+@@ -34,6 +34,7 @@
+ #ifndef FLYWHEELBUTTON_H
+ #define FLYWHEELBUTTON_H
+
++#include <QtGlobal>
+ #include <QWidget>
+ #include <QPainter>
+ #include <QMouseEvent>
+diff --git a/header_editor.h b/header_editor.h
+index 6ca4e36..911ac3f 100644
+--- a/header_editor.h
++++ b/header_editor.h
+@@ -34,6 +34,7 @@
+ #define UI_HEADEREDITORFORM_H
+
+
++#include <QtGlobal>
+ #include <QApplication>
+ #include <QObject>
+ #include <QDialog>
+diff --git a/import_annotations.h b/import_annotations.h
+index f27c0b0..f4acbd7 100644
+--- a/import_annotations.h
++++ b/import_annotations.h
+@@ -37,6 +37,7 @@
+
+
+
++#include <QtGlobal>
+ #include <QApplication>
+ #include <QObject>
+ #include <QFileDialog>
+diff --git a/jump_dialog.h b/jump_dialog.h
+index c3a234c..1e0143b 100644
+--- a/jump_dialog.h
++++ b/jump_dialog.h
+@@ -37,6 +37,7 @@
+
+
+
++#include <QtGlobal>
+ #include <QApplication>
+ #include <QObject>
+ #include <QWidget>
+diff --git a/load_montage_dialog.h b/load_montage_dialog.h
+index 7656f29..b2ed48e 100644
+--- a/load_montage_dialog.h
++++ b/load_montage_dialog.h
+@@ -37,6 +37,7 @@
+
+
+
++#include <QtGlobal>
+ #include <QApplication>
+ #include <QObject>
+ #include <QDialog>
+diff --git a/mainwindow.h b/mainwindow.h
+index 2eb0aaa..ec7dc9a 100644
+--- a/mainwindow.h
++++ b/mainwindow.h
+@@ -33,6 +33,7 @@
+ #ifndef UI_VIEW_MAINFORM_H
+ #define UI_VIEW_MAINFORM_H
+
++#include <QtGlobal>
+ #include <QApplication>
+ #include <QMainWindow>
+ #include <QMenuBar>
+diff --git a/manscan2edf.h b/manscan2edf.h
+index 6a41bef..c2b315d 100644
+--- a/manscan2edf.h
++++ b/manscan2edf.h
+@@ -34,6 +34,7 @@
+ #define UI_MANSCAN2EDFFORM_H
+
+
++#include <QtGlobal>
+ #include <QApplication>
+ #include <QDialog>
+ #include <QPushButton>
+diff --git a/nexfin2edf.h b/nexfin2edf.h
+index a86d379..5bee4eb 100644
+--- a/nexfin2edf.h
++++ b/nexfin2edf.h
+@@ -34,6 +34,7 @@
+ #define UI_NEXFIN2EDFFORM_H
+
+
++#include <QtGlobal>
+ #include <QApplication>
+ #include <QDialog>
+ #include <QLabel>
+diff --git a/nk2edf.h b/nk2edf.h
+index 10b2b12..20c01d4 100644
+--- a/nk2edf.h
++++ b/nk2edf.h
+@@ -34,6 +34,7 @@
+ #define UI_NK2EDFFORM_H
+
+
++#include <QtGlobal>
+ #include <QApplication>
+ #include <QDialog>
+ #include <QPushButton>
+diff --git a/options_dialog.h b/options_dialog.h
+index 527e151..d101e11 100644
+--- a/options_dialog.h
++++ b/options_dialog.h
+@@ -37,6 +37,7 @@
+
+
+
++#include <QtGlobal>
+ #include <QApplication>
+ #include <QObject>
+ #include <QWidget>
+diff --git a/pagetime_dialog.h b/pagetime_dialog.h
+index b70803d..08e8b2e 100644
+--- a/pagetime_dialog.h
++++ b/pagetime_dialog.h
+@@ -37,6 +37,7 @@
+
+
+
++#include <QtGlobal>
+ #include <QApplication>
+ #include <QObject>
+ #include <QWidget>
+diff --git a/popup_messagewindow.h b/popup_messagewindow.h
+index 545c270..597b538 100644
+--- a/popup_messagewindow.h
++++ b/popup_messagewindow.h
+@@ -37,6 +37,7 @@
+
+
+
++#include <QtGlobal>
+ #include <QApplication>
+ #include <QObject>
+ #include <QDialog>
+diff --git a/popup_save_cancelwindow.h b/popup_save_cancelwindow.h
+index b01966f..4844105 100644
+--- a/popup_save_cancelwindow.h
++++ b/popup_save_cancelwindow.h
+@@ -37,6 +37,7 @@
+
+
+
++#include <QtGlobal>
+ #include <QApplication>
+ #include <QObject>
+ #include <QDialog>
+diff --git a/print_to_bdf.h b/print_to_bdf.h
+index 270cb32..136112a 100644
+--- a/print_to_bdf.h
++++ b/print_to_bdf.h
+@@ -37,6 +37,7 @@
+
+
+
++#include <QtGlobal>
+ #include <QApplication>
+ #include <QFileDialog>
+ #include <QMessageBox>
+diff --git a/print_to_edf.h b/print_to_edf.h
+index 3b58f97..440eb18 100644
+--- a/print_to_edf.h
++++ b/print_to_edf.h
+@@ -37,6 +37,7 @@
+
+
+
++#include <QtGlobal>
+ #include <QApplication>
+ #include <QFileDialog>
+ #include <QMessageBox>
+diff --git a/raw2edf.h b/raw2edf.h
+index 6e42a3d..6d0458b 100644
+--- a/raw2edf.h
++++ b/raw2edf.h
+@@ -34,6 +34,7 @@
+ #define UI_RAW2EDFFORM_H
+
+
++#include <QtGlobal>
+ #include <QApplication>
+ #include <QObject>
+ #include <QDialog>
+diff --git a/reduce_signals.h b/reduce_signals.h
+index 9617883..94bbea4 100644
+--- a/reduce_signals.h
++++ b/reduce_signals.h
+@@ -34,6 +34,7 @@
+ #define UI_REDUCESIGNALSFORM_H
+
+
++#include <QtGlobal>
+ #include <QApplication>
+ #include <QDialog>
+ #include <QLabel>
+diff --git a/save_annots.h b/save_annots.h
+index e07b1b9..19e6862 100644
+--- a/save_annots.h
++++ b/save_annots.h
+@@ -42,6 +42,7 @@
+ #include <stdlib.h>
+ #include <string.h>
+
++#include <QtGlobal>
+ #include <QApplication>
+ #include <QProgressDialog>
+
+diff --git a/save_montage_dialog.h b/save_montage_dialog.h
+index 4a93e02..d244a1a 100644
+--- a/save_montage_dialog.h
++++ b/save_montage_dialog.h
+@@ -37,6 +37,7 @@
+
+
+
++#include <QtGlobal>
+ #include <QApplication>
+ #include <QObject>
+ #include <QDialog>
+diff --git a/scp_ecg2edf.h b/scp_ecg2edf.h
+index c86e66a..8ee7a3d 100644
+--- a/scp_ecg2edf.h
++++ b/scp_ecg2edf.h
+@@ -34,6 +34,7 @@
+ #define UI_SCPECG2EDFFORM_H
+
+
++#include <QtGlobal>
+ #include <QApplication>
+ #include <QDialog>
+ #include <QPushButton>
+diff --git a/show_actual_montage_dialog.h b/show_actual_montage_dialog.h
+index a502f83..79627bb 100644
+--- a/show_actual_montage_dialog.h
++++ b/show_actual_montage_dialog.h
+@@ -37,6 +37,7 @@
+
+
+
++#include <QtGlobal>
+ #include <QApplication>
+ #include <QObject>
+ #include <QDialog>
+diff --git a/show_edf_hdr.h b/show_edf_hdr.h
+index 8cbeaa4..2c3f811 100644
+--- a/show_edf_hdr.h
++++ b/show_edf_hdr.h
+@@ -37,6 +37,7 @@
+
+
+
++#include <QtGlobal>
+ #include <QApplication>
+ #include <QObject>
+ #include <QDialog>
+diff --git a/signal_chooser.h b/signal_chooser.h
+index 8de9d71..6301bba 100644
+--- a/signal_chooser.h
++++ b/signal_chooser.h
+@@ -37,6 +37,7 @@
+
+
+
++#include <QtGlobal>
+ #include <QApplication>
+ #include <QObject>
+ #include <QListWidget>
+diff --git a/signalcurve.h b/signalcurve.h
+index e0e5e94..8b16cc6 100644
+--- a/signalcurve.h
++++ b/signalcurve.h
+@@ -35,6 +35,7 @@
+ #define SIGNALCURVE_H
+
+
++#include <QtGlobal>
+ #include <QWidget>
+ #include <QMouseEvent>
+ #include <QPainter>
+diff --git a/signals_dialog.h b/signals_dialog.h
+index 9adf964..4bb7fab 100644
+--- a/signals_dialog.h
++++ b/signals_dialog.h
+@@ -37,6 +37,7 @@
+
+
+
++#include <QtGlobal>
+ #include <QApplication>
+ #include <QObject>
+ #include <QDialog>
+diff --git a/special_button.h b/special_button.h
+index 63bc214..e4e490c 100644
+--- a/special_button.h
++++ b/special_button.h
+@@ -36,6 +36,7 @@
+
+ #include <string.h>
+
++#include <QtGlobal>
+ #include <QWidget>
+ #include <QPainter>
+ #include <QMouseEvent>
+diff --git a/spectrum_dock.h b/spectrum_dock.h
+index 413b4ef..d37c61a 100644
+--- a/spectrum_dock.h
++++ b/spectrum_dock.h
+@@ -36,6 +36,7 @@
+
+
+
++#include <QtGlobal>
+ #include <QApplication>
+ #include <QDialog>
+ #include <QDockWidget>
+diff --git a/spectrumanalyzer.h b/spectrumanalyzer.h
+index b8675b9..6bd24da 100644
+--- a/spectrumanalyzer.h
++++ b/spectrumanalyzer.h
+@@ -36,6 +36,7 @@
+
+
+
++#include <QtGlobal>
+ #include <QApplication>
+ #include <QDialog>
+ #include <QHBoxLayout>
+diff --git a/statistics_dialog.h b/statistics_dialog.h
+index 00c16e9..9f29cea 100644
+--- a/statistics_dialog.h
++++ b/statistics_dialog.h
+@@ -37,6 +37,7 @@
+
+
+
++#include <QtGlobal>
+ #include <QApplication>
+ #include <QObject>
+ #include <QDialog>
+diff --git a/unisens2edf.h b/unisens2edf.h
+index ba28608..00c6afe 100644
+--- a/unisens2edf.h
++++ b/unisens2edf.h
+@@ -34,6 +34,7 @@
+ #define UI_UNISENS2EDFFORM_H
+
+
++#include <QtGlobal>
+ #include <QApplication>
+ #include <QObject>
+ #include <QDialog>
+diff --git a/view_montage_dialog.h b/view_montage_dialog.h
+index 55a02a7..d71fccb 100644
+--- a/view_montage_dialog.h
++++ b/view_montage_dialog.h
+@@ -37,6 +37,7 @@
+
+
+
++#include <QtGlobal>
+ #include <QApplication>
+ #include <QObject>
+ #include <QDialog>
+diff --git a/viewcurve.h b/viewcurve.h
+index 8d4d3d4..bfd7e70 100644
+--- a/viewcurve.h
++++ b/viewcurve.h
+@@ -34,6 +34,7 @@
+ #ifndef VIEWCURVE_H
+ #define VIEWCURVE_H
+
++#include <QtGlobal>
+ #include <QWidget>
+ #include <QPainter>
+ #include <QMouseEvent>
+diff --git a/wav2edf.h b/wav2edf.h
+index d10ae88..3049e44 100644
+--- a/wav2edf.h
++++ b/wav2edf.h
+@@ -34,6 +34,7 @@
+ #define UI_WAV2EDFFORM_H
+
+
++#include <QtGlobal>
+ #include <QApplication>
+ #include <QDialog>
+ #include <QLabel>
+diff --git a/z_score_dialog.h b/z_score_dialog.h
+index e76395d..946c41a 100644
+--- a/z_score_dialog.h
++++ b/z_score_dialog.h
+@@ -37,6 +37,7 @@
+
+
+
++#include <QtGlobal>
+ #include <QApplication>
+ #include <QObject>
+ #include <QListWidget>
+--
+2.1.1
+
Added: trunk/packages/edfbrowser/trunk/debian/patches/0002-Try-to-prevent-compile-errors-on-Freebsd.patch
===================================================================
--- trunk/packages/edfbrowser/trunk/debian/patches/0002-Try-to-prevent-compile-errors-on-Freebsd.patch (rev 0)
+++ trunk/packages/edfbrowser/trunk/debian/patches/0002-Try-to-prevent-compile-errors-on-Freebsd.patch 2014-10-25 06:47:32 UTC (rev 18394)
@@ -0,0 +1,306 @@
+From 87ca89ed1a4b58c8135457f05aa7c708b3857a3a Mon Sep 17 00:00:00 2001
+From: Teuniz <teuniz at gmail.com>
+Date: Sat, 18 Oct 2014 22:30:01 +0200
+Subject: [PATCH 2/3] Try to prevent compile errors on Freebsd.
+
+---
+ annotations_dock.cpp | 17 ++--------
+ check_for_updates.cpp | 8 ++---
+ mainwindow.cpp | 91 +++++++++++++++------------------------------------
+ mainwindow.h | 27 +++++----------
+ viewcurve.cpp | 10 ------
+ 5 files changed, 42 insertions(+), 111 deletions(-)
+
+diff --git a/annotations_dock.cpp b/annotations_dock.cpp
+index 94409a1..dd58266 100644
+--- a/annotations_dock.cpp
++++ b/annotations_dock.cpp
+@@ -698,24 +698,13 @@ void UI_Annotationswindow::updateList(void)
+
+ selected = -1;
+
+-
+-#ifdef Q_OS_LINUX
+- QFont specialfont("andale mono", 12, QFont::Normal, true);
+-
+- specialfont.setPixelSize(12);
+-#endif
+-
+-#ifdef Q_OS_MAC
+- QFont specialfont("andale mono", 12, QFont::Normal, true);
+-
+- specialfont.setPixelSize(12);
+-#endif
+-
+ #ifdef Q_OS_WIN32
+ QFont specialfont("courier", 11, QFont::Normal, true);
++#else
++ QFont specialfont("andale mono", 12, QFont::Normal, true);
++#endif
+
+ specialfont.setPixelSize(12);
+-#endif
+
+ list->clear();
+
+diff --git a/check_for_updates.cpp b/check_for_updates.cpp
+index 2d21f37..116bc7d 100644
+--- a/check_for_updates.cpp
++++ b/check_for_updates.cpp
+@@ -49,12 +49,12 @@ Check_for_updates::Check_for_updates()
+ request.setRawHeader("User-Agent", PROGRAM_NAME " " PROGRAM_VERSION " OS_UNKNOWN");
+ #ifdef Q_OS_LINUX
+ request.setRawHeader("User-Agent", PROGRAM_NAME " " PROGRAM_VERSION " Q_OS_LINUX");
+-#endif
+-#ifdef Q_OS_MAC
++#elif defined (Q_OS_MAC)
+ request.setRawHeader("User-Agent", PROGRAM_NAME " " PROGRAM_VERSION " Q_OS_MAC");
+-#endif
+-#ifdef Q_OS_WIN32
++#elif defined (Q_OS_WIN32)
+ request.setRawHeader("User-Agent", PROGRAM_NAME " " PROGRAM_VERSION " Q_OS_WIN32");
++#else
++ request.setRawHeader("User-Agent", PROGRAM_NAME " " PROGRAM_VERSION " Q_OS_OTHER");
+ #endif
+ request.setAttribute(QNetworkRequest::CacheLoadControlAttribute, QNetworkRequest::AlwaysNetwork);
+
+diff --git a/mainwindow.cpp b/mainwindow.cpp
+index 175c934..1b2a492 100644
+--- a/mainwindow.cpp
++++ b/mainwindow.cpp
+@@ -68,17 +68,15 @@ UI_Mainwindow::UI_Mainwindow()
+
+ monofont = new QFont;
+
+-#ifdef Q_OS_LINUX
++#ifdef Q_OS_WIN32
+ QApplication::setFont(*myfont);
+
+- myfont->setFamily("Arial");
+- myfont->setPixelSize(12);
++ myfont->setFamily("Tahoma");
++ myfont->setPixelSize(11);
+
+- monofont->setFamily("andale mono");
++ monofont->setFamily("courier");
+ monofont->setPixelSize(12);
+-#endif
+-
+-#ifdef Q_OS_MAC
++#else
+ QApplication::setFont(*myfont);
+
+ myfont->setFamily("Arial");
+@@ -88,14 +86,6 @@ UI_Mainwindow::UI_Mainwindow()
+ monofont->setPixelSize(12);
+ #endif
+
+-#ifdef Q_OS_WIN32
+- myfont->setFamily("Tahoma");
+- myfont->setPixelSize(11);
+-
+- monofont->setFamily("courier");
+- monofont->setPixelSize(12);
+-#endif
+-
+ setlocale(LC_NUMERIC, "C");
+
+ pixelsizefactor = 0.0294382;
+@@ -4545,23 +4535,16 @@ void UI_Mainwindow::read_color_settings()
+
+ cfg_path[0] = 0;
+
+-#ifdef Q_OS_LINUX
+- strcpy(cfg_path, getenv("HOME"));
+- strcat(cfg_path, "/.");
+- strcat(cfg_path, PROGRAM_NAME);
+- strcat(cfg_path, "/settings.xml");
+-#endif
+-#ifdef Q_OS_MAC
+- strcpy(cfg_path, getenv("HOME"));
+- strcat(cfg_path, "/.");
+- strcat(cfg_path, PROGRAM_NAME);
+- strcat(cfg_path, "/settings.xml");
+-#endif
+ #ifdef Q_OS_WIN32
+ strcpy(cfg_path, specialFolder(CSIDL_APPDATA).toLocal8Bit().data());
+ strcat(cfg_path, "\\");
+ strcat(cfg_path, PROGRAM_NAME);
+ strcat(cfg_path, "\\settings.xml");
++#else
++ strcpy(cfg_path, getenv("HOME"));
++ strcat(cfg_path, "/.");
++ strcat(cfg_path, PROGRAM_NAME);
++ strcat(cfg_path, "/settings.xml");
+ #endif
+
+ xml_hdl = xml_get_handle(cfg_path);
+@@ -4728,23 +4711,16 @@ void UI_Mainwindow::read_recent_file_settings()
+
+ cfg_path[0] = 0;
+
+-#ifdef Q_OS_LINUX
+- strcpy(cfg_path, getenv("HOME"));
+- strcat(cfg_path, "/.");
+- strcat(cfg_path, PROGRAM_NAME);
+- strcat(cfg_path, "/settings.xml");
+-#endif
+-#ifdef Q_OS_MAC
+- strcpy(cfg_path, getenv("HOME"));
+- strcat(cfg_path, "/.");
+- strcat(cfg_path, PROGRAM_NAME);
+- strcat(cfg_path, "/settings.xml");
+-#endif
+ #ifdef Q_OS_WIN32
+ strcpy(cfg_path, specialFolder(CSIDL_APPDATA).toLocal8Bit().data());
+ strcat(cfg_path, "\\");
+ strcat(cfg_path, PROGRAM_NAME);
+ strcat(cfg_path, "\\settings.xml");
++#else
++ strcpy(cfg_path, getenv("HOME"));
++ strcat(cfg_path, "/.");
++ strcat(cfg_path, PROGRAM_NAME);
++ strcat(cfg_path, "/settings.xml");
+ #endif
+
+ xml_hdl = xml_get_handle(cfg_path);
+@@ -4953,23 +4929,16 @@ void UI_Mainwindow::read_general_settings()
+
+ cfg_path[0] = 0;
+
+-#ifdef Q_OS_LINUX
+- strcpy(cfg_path, getenv("HOME"));
+- strcat(cfg_path, "/.");
+- strcat(cfg_path, PROGRAM_NAME);
+- strcat(cfg_path, "/settings.xml");
+-#endif
+-#ifdef Q_OS_MAC
+- strcpy(cfg_path, getenv("HOME"));
+- strcat(cfg_path, "/.");
+- strcat(cfg_path, PROGRAM_NAME);
+- strcat(cfg_path, "/settings.xml");
+-#endif
+ #ifdef Q_OS_WIN32
+ strcpy(cfg_path, specialFolder(CSIDL_APPDATA).toLocal8Bit().data());
+ strcat(cfg_path, "\\");
+ strcat(cfg_path, PROGRAM_NAME);
+ strcat(cfg_path, "\\settings.xml");
++#else
++ strcpy(cfg_path, getenv("HOME"));
++ strcat(cfg_path, "/.");
++ strcat(cfg_path, PROGRAM_NAME);
++ strcat(cfg_path, "/settings.xml");
+ #endif
+
+ xml_hdl = xml_get_handle(cfg_path);
+@@ -6321,26 +6290,18 @@ void UI_Mainwindow::write_settings()
+
+ cfg_path[0] = 0;
+
+-#ifdef Q_OS_LINUX
+- strcpy(cfg_path, getenv("HOME"));
+- strcat(cfg_path, "/.");
+- strcat(cfg_path, PROGRAM_NAME);
+- mkdir(cfg_path, S_IRWXU);
+- strcat(cfg_path, "/settings.xml");
+-#endif
+-#ifdef Q_OS_MAC
+- strcpy(cfg_path, getenv("HOME"));
+- strcat(cfg_path, "/.");
+- strcat(cfg_path, PROGRAM_NAME);
+- mkdir(cfg_path, S_IRWXU);
+- strcat(cfg_path, "/settings.xml");
+-#endif
+ #ifdef Q_OS_WIN32
+ strcpy(cfg_path, specialFolder(CSIDL_APPDATA).toLocal8Bit().data());
+ strcat(cfg_path, "\\");
+ strcat(cfg_path, PROGRAM_NAME);
+ mkdir(cfg_path);
+ strcat(cfg_path, "\\settings.xml");
++#else
++ strcpy(cfg_path, getenv("HOME"));
++ strcat(cfg_path, "/.");
++ strcat(cfg_path, PROGRAM_NAME);
++ mkdir(cfg_path, S_IRWXU);
++ strcat(cfg_path, "/settings.xml");
+ #endif
+
+ cfgfile = fopeno(cfg_path, "wb");
+diff --git a/mainwindow.h b/mainwindow.h
+index ec7dc9a..a619d25 100644
+--- a/mainwindow.h
++++ b/mainwindow.h
+@@ -42,30 +42,18 @@
+ #include <QToolBar>
+ #include <QSlider>
+ #include <QStyle>
++#include <QCloseEvent>
++
+ #if QT_VERSION < 0x050000
+ #include <QPlastiqueStyle>
+ #include <QGtkStyle>
+ #include <QWindowsStyle>
++ #ifdef Q_OS_MAC
++ #include <QMacStyle>
++ #endif
+ #else
+ #include <QStyleFactory>
+ #endif
+-#include <QtGlobal>
+-#include <QCloseEvent>
+-
+-#ifdef Q_OS_LINUX
+- #include <sys/types.h>
+- #include <sys/stat.h>
+-#endif
+-
+-#ifdef Q_OS_MAC
+-#if QT_VERSION < 0x050000
+- #include <QMacStyle>
+-#else
+- #include <QStyleFactory>
+-#endif
+- #include <sys/types.h>
+- #include <sys/stat.h>
+-#endif
+
+ #ifdef Q_OS_WIN32
+ #include <windows.h>
+@@ -80,8 +68,11 @@
+ #define CSIDL_PROGRAM_FILES 0x0026 // C:\Program Files
+ #endif
+ #if QT_VERSION >= 0x050000
+- #define QT_WA(unicode, ansi) unicode
++ #define QT_WA(unicode, ansi) unicode
+ #endif
++#else
++ #include <sys/types.h>
++ #include <sys/stat.h>
+ #endif
+
+ #include <QFileDialog>
+diff --git a/viewcurve.cpp b/viewcurve.cpp
+index 141ac2f..5b98c07 100644
+--- a/viewcurve.cpp
++++ b/viewcurve.cpp
+@@ -1373,17 +1373,7 @@ void ViewCurve::drawCurve_stage_2(QPainter *painter, int w_width, int w_height,
+ w = w_width;
+ h = w_height;
+
+-#ifdef Q_OS_LINUX
+ printfont->setPixelSize((int)((double)w / 104.0));
+-#endif
+-
+-#ifdef Q_OS_MAC
+- printfont->setPixelSize((int)((double)w / 104.0));
+-#endif
+-
+-#ifdef Q_OS_WIN32
+- printfont->setPixelSize((int)((double)w / 104.0));
+-#endif
+
+ painter->setFont(*printfont);
+
+--
+2.1.1
+
Added: trunk/packages/edfbrowser/trunk/debian/patches/0003-Fixed-a-bug-with-font-setting.patch
===================================================================
--- trunk/packages/edfbrowser/trunk/debian/patches/0003-Fixed-a-bug-with-font-setting.patch (rev 0)
+++ trunk/packages/edfbrowser/trunk/debian/patches/0003-Fixed-a-bug-with-font-setting.patch 2014-10-25 06:47:32 UTC (rev 18394)
@@ -0,0 +1,42 @@
+From ef386e1f9cb437e11c0be88c6008d3bdfcdf6900 Mon Sep 17 00:00:00 2001
+From: Teuniz <teuniz at gmail.com>
+Date: Sat, 18 Oct 2014 22:39:12 +0200
+Subject: [PATCH 3/3] Fixed a bug with font setting.
+
+---
+ mainwindow.cpp | 6 ++----
+ 1 file changed, 2 insertions(+), 4 deletions(-)
+
+diff --git a/mainwindow.cpp b/mainwindow.cpp
+index 1b2a492..5f37f0a 100644
+--- a/mainwindow.cpp
++++ b/mainwindow.cpp
+@@ -69,16 +69,12 @@ UI_Mainwindow::UI_Mainwindow()
+ monofont = new QFont;
+
+ #ifdef Q_OS_WIN32
+- QApplication::setFont(*myfont);
+-
+ myfont->setFamily("Tahoma");
+ myfont->setPixelSize(11);
+
+ monofont->setFamily("courier");
+ monofont->setPixelSize(12);
+ #else
+- QApplication::setFont(*myfont);
+-
+ myfont->setFamily("Arial");
+ myfont->setPixelSize(12);
+
+@@ -86,6 +82,8 @@ UI_Mainwindow::UI_Mainwindow()
+ monofont->setPixelSize(12);
+ #endif
+
++ QApplication::setFont(*myfont);
++
+ setlocale(LC_NUMERIC, "C");
+
+ pixelsizefactor = 0.0294382;
+--
+2.1.1
+
Added: trunk/packages/edfbrowser/trunk/debian/patches/series
===================================================================
--- trunk/packages/edfbrowser/trunk/debian/patches/series (rev 0)
+++ trunk/packages/edfbrowser/trunk/debian/patches/series 2014-10-25 06:47:32 UTC (rev 18394)
@@ -0,0 +1,3 @@
+0001-Fixed-a-bug-that-could-possibly-cause-a-compile-erro.patch
+0002-Try-to-prevent-compile-errors-on-Freebsd.patch
+0003-Fixed-a-bug-with-font-setting.patch
More information about the debian-med-commit
mailing list