Commit 9f8626f4 authored by Andreas Tille's avatar Andreas Tille
Browse files

New upstream version 1.68+dfsg

parent 6276e204

README.txt

+13 −17
Original line number Diff line number Diff line
@@ -8,11 +8,7 @@ Minimum version 4.7.1 or later, preferable 4.8.7 
If you want to use Qt5, it must be version >= 5.9.1.

For info how to compile Qt5 from source, scroll down.



The GCC compiler on Linux or Mingw-w64 on windows. <http://mingw-w64.sourceforge.net/>



http://sourceforge.net/projects/mingw-w64/files/Toolchains%20targetting%20Win32/Personal%20Builds/mingw-builds/4.8.2/threads-posix/dwarf/i686-4.8.2-release-posix-dwarf-rt_v3-rev3.7z/download



Do not use microsoft tools or compilers!

EDFbrowser is a Linux & GCC & GNU make project. Other tools or compilers are not supported.





Introduction
@@ -26,7 +22,7 @@ process. qmake is part of your Qt4 installation. 
Build and run without "installing"

==================================



You need to have Qt and GCC (Mingw-w64 on Windows) installed.

You need to have Qt and GCC and Make installed.



Extract the sourcefile and enter the following commands:
@@ -87,7 +83,7 @@ Fedora: sudo dnf groupinstall "C Development Tools and Libraries" 
        sudo dnf install mesa-libGL-devel cups-devel libx11-dev



openSUSE: sudo zypper install -t pattern devel_basis

          sudo zypper install xorg-x11-devel cups-devel freetype-devel fontconfig-devel

          sudo zypper install xorg-x11-devel cups-devel freetype-devel fontconfig-devel libxkbcommon-devel libxkbcommon-x11-devel



#############################################################################################

#                                                                                           #
@@ -95,7 +91,7 @@ openSUSE: sudo zypper install -t pattern devel_basis 
#                                                                                           #

# This will not mess with your system libraries. The new compiled libraries will be stored  #

#                                                                                           #

# in a new and separate directory: /usr/local/Qt-5.9.7-static                               #

# in a new and separate directory: /usr/local/Qt-5.12.3-static                              #

#                                                                                           #

# It will not interfere with other Qt programs.                                             #

#                                                                                           #
@@ -105,20 +101,20 @@ mkdir Qt5-source 


cd Qt5-source



wget http://ftp1.nluug.nl/languages/qt/official_releases/qt/5.9/5.9.7/single/qt-everywhere-opensource-src-5.9.7.tar.xz

wget http://ftp1.nluug.nl/languages/qt/official_releases/qt/5.12/5.12.3/single/qt-everywhere-src-5.12.3.tar.xz



here is a list of download mirrors: https://download.qt.io/static/mirrorlist/

The Qt source package you are going to need is: qt-everywhere-opensource-src-5.9.7.tar.xz

The Qt source package you are going to need is: qt-everywhere-src-5.12.3.tar.xz



tar -xvf qt-everywhere-opensource-src-5.9.7.tar.xz

tar -xvf qt-everywhere-src-5.12.3.tar.xz



cd qt-everywhere-opensource-src-5.9.7

cd qt-everywhere-src-5.12.3



./configure -v -prefix /usr/local/Qt-5.9.7-static -release -opensource -confirm-license -c++std c++11 -static -accessibility -fontconfig -skip qtdeclarative -skip qtconnectivity -skip qtmultimedia -no-qml-debug -qt-zlib -no-mtdev -no-journald -qt-libpng -qt-libjpeg -system-freetype -qt-harfbuzz -no-openssl -no-libproxy -no-glib -nomake examples -nomake tests -no-compile-examples -cups -no-evdev -no-dbus -no-eglfs -qreal double -no-opengl -skip qtlocation -skip qtsensors -skip qtwayland -skip qtgamepad -skip qtserialbus

./configure -v -prefix /usr/local/Qt-5.12.3-static -release -opensource -confirm-license -c++std c++11 -static -accessibility -fontconfig -skip qtdeclarative -skip qtconnectivity -skip qtmultimedia -qt-zlib -no-mtdev -no-journald -qt-libpng -qt-libjpeg -system-freetype -qt-harfbuzz -no-openssl -no-libproxy -no-glib -nomake examples -nomake tests -no-compile-examples -cups -no-evdev -no-dbus -no-eglfs -qreal double -no-opengl -skip qtlocation -skip qtsensors -skip qtwayland -skip qtgamepad -skip qtserialbus -skip qt3d -skip qtpurchasing -skip qtquickcontrols -skip qtquickcontrols2 -skip qtspeech -skip qtwebengine



(takes about 1.5 minutes)

(takes about 2 minutes)



make -j8

make -j6  (change option -j according to number of available cpu cores e.g -j4 or -j8)



(takes about 11 minutes)
@@ -126,9 +122,9 @@ sudo make install 


Now go to the directory that contains the EDFbrowser sourcecode and enter the following commands:



/usr/local/Qt-5.9.7-static/bin/qmake

/usr/local/Qt-5.12.3-static/bin/qmake



make -j8

make -j6  (change option -j according to number of available cpu cores e.g -j4 or -j8)



sudo make install

about_dialog.cpp

+3 −5
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ 
*

* Copyright (C) 2007 - 2019 Teunis van Beelen

*

* Email: teuniz@gmail.com

* Email: teuniz@protonmail.com

*

***************************************************************************

*
@@ -30,8 +30,6 @@ 


#include "about_dialog.h"







UI_Aboutwindow::UI_Aboutwindow(UI_Mainwindow *mainwindow)

{

  char str[512];
@@ -65,10 +63,10 @@ UI_Aboutwindow::UI_Aboutwindow(UI_Mainwindow *mainwindow) 
  textedit1->setReadOnly(true);

  textedit1->setLineWrapMode(QTextEdit::NoWrap);

  textedit1->setPlainText(

        "\n " PROGRAM_NAME " " PROGRAM_VERSION "\n"

        "\n " PROGRAM_NAME " version " PROGRAM_VERSION " " PROGRAM_BETA_SUFFIX "    " THIS_APP_BITS_W "\n"

        "\n This program is made by Teunis van Beelen.\n"

        "\n Copyright (C) 2007 - 2019 Teunis van Beelen.\n"

        "\n Email: teuniz@gmail.com\n"

        "\n Email: teuniz@protonmail.com\n"

        "\n Disclaimer:\n"

        " Despite this software is intend to be useful, there is no warranty, use this software at your own risk!\n"

        " EDFbrowser may NOT be used in safety-critical applications, such as life-support medical systems.\n"

about_dialog.h

+1 −1
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ 
*

* Copyright (C) 2007 - 2019 Teunis van Beelen

*

* Email: teuniz@gmail.com

* Email: teuniz@protonmail.com

*

***************************************************************************

*

active_file_chooser.cpp

+1 −1
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ 
*

* Copyright (C) 2010 - 2019 Teunis van Beelen

*

* Email: teuniz@gmail.com

* Email: teuniz@protonmail.com

*

***************************************************************************

*

active_file_chooser.h

+1 −1
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ 
*

* Copyright (C) 2010 - 2019 Teunis van Beelen

*

* Email: teuniz@gmail.com

* Email: teuniz@protonmail.com

*

***************************************************************************

*