Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package qsynth for openSUSE:Factory checked
in at 2021-07-04 22:10:56
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/qsynth (Old)
and /work/SRC/openSUSE:Factory/.qsynth.new.2625 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "qsynth"
Sun Jul 4 22:10:56 2021 rev:15 rq:903966 version:0.9.4
Changes:
--------
--- /work/SRC/openSUSE:Factory/qsynth/qsynth.changes 2021-05-11
23:04:31.940855881 +0200
+++ /work/SRC/openSUSE:Factory/.qsynth.new.2625/qsynth.changes 2021-07-04
22:10:58.245123304 +0200
@@ -1,0 +2,7 @@
+Sun Jul 4 15:44:42 UTC 2021 - Luigi Baldoni <aloi...@gmx.com>
+
+- Update to version 0.9.4
+ * All builds default to Qt6 (Qt >= 6.1) where available.
+ * CMake is now the new official build system.
+
+-------------------------------------------------------------------
Old:
----
qsynth-0.9.3.tar.gz
New:
----
qsynth-0.9.4.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ qsynth.spec ++++++
--- /var/tmp/diff_new_pack.XYsxlN/_old 2021-07-04 22:10:58.973117674 +0200
+++ /var/tmp/diff_new_pack.XYsxlN/_new 2021-07-04 22:10:58.977117643 +0200
@@ -18,7 +18,7 @@
Name: qsynth
-Version: 0.9.3
+Version: 0.9.4
Release: 0
Summary: Graphical User Interface for fluidsynth
License: GPL-2.0-or-later
++++++ qsynth-0.9.3.tar.gz -> qsynth-0.9.4.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/qsynth-0.9.3/CMakeLists.txt
new/qsynth-0.9.4/CMakeLists.txt
--- old/qsynth-0.9.3/CMakeLists.txt 2021-05-10 16:41:01.283234544 +0200
+++ new/qsynth-0.9.4/CMakeLists.txt 2021-07-03 10:48:25.566266927 +0200
@@ -1,7 +1,7 @@
-cmake_minimum_required(VERSION 3.10)
+cmake_minimum_required (VERSION 3.13)
-project(qsynth
- VERSION 0.9.3
+project (qsynth
+ VERSION 0.9.4
DESCRIPTION "A fluidsynth Qt GUI Interface"
LANGUAGES C CXX)
@@ -45,16 +45,17 @@
set (CONFIG_BUILD_VERSION "${PACKAGE_VERSION}")
-if (CMAKE_BUILD_TYPE)
- set (CONFIG_BUILD_TYPE ${CMAKE_BUILD_TYPE})
-else ()
- set (CONFIG_BUILD_TYPE "release")
+if (CONFIG_DEBUG)
+ set (CMAKE_BUILD_TYPE "Debug")
endif ()
-
-set (CONFIG_DEBUG 0)
-if (CONFIG_BUILD_TYPE MATCHES "debug")
+if (CMAKE_BUILD_TYPE MATCHES "Debug")
set (CONFIG_DEBUG 1)
endif ()
+if (CONFIG_DEBUG)
+ set (CONFIG_BUILD_TYPE "debug")
+else ()
+ set (CONFIG_BUILD_TYPE "release")
+endif ()
set (CONFIG_PREFIX "${CMAKE_INSTALL_PREFIX}")
@@ -88,7 +89,7 @@
# Enable Qt6 build preference.
-option (CONFIG_QT6 "Enable Qt6 build (default=no)" 0)
+option (CONFIG_QT6 "Enable Qt6 build (default=yes)" 1)
# Fix for new CMAKE_REQUIRED_LIBRARIES policy.
@@ -146,13 +147,15 @@
# Find package modules
-find_package (PkgConfig REQUIRED)
+include (FindPkgConfig)
# Check for FLUIDSYNTH library.
pkg_check_modules (FLUIDSYNTH REQUIRED IMPORTED_TARGET fluidsynth)
if (FLUIDSYNTH_FOUND)
- set (CONFIG_FLUIDSYNTH 1)
find_library(FLUIDSYNTH_LIBRARY NAMES ${FLUIDSYNTH_LIBRARIES} HINTS
${FLUIDSYNTH_LIBDIR})
+endif ()
+if (FLUIDSYNTH_LIBRARY)
+ set (CONFIG_FLUIDSYNTH 1)
set (CMAKE_REQUIRED_LIBRARIES
"${FLUIDSYNTH_LIBRARY};${CMAKE_REQUIRED_LIBRARIES}")
# Check for fluid_synth_system_reset function.
check_function_exists (fluid_synth_system_reset CONFIG_FLUID_SYSTEM_RESET)
@@ -250,5 +253,5 @@
show_option (" Unique/Single instance support . . . . . . . . . ."
CONFIG_XUNIQUE)
show_option (" Gradient eye-candy . . . . . . . . . . . . . . . ."
CONFIG_GRADIENT)
show_option (" Debugger stack-trace (gdb) . . . . . . . . . . . ."
CONFIG_STACKTRACE)
-message ("\n Install prefix . . . . . . . . . . . . . . . . . .:
${CMAKE_INSTALL_PREFIX}")
+message ("\n Install prefix . . . . . . . . . . . . . . . . . .:
${CONFIG_PREFIX}")
message ("\nNow type 'make', followed by 'make install' as root.\n")
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/qsynth-0.9.3/ChangeLog new/qsynth-0.9.4/ChangeLog
--- old/qsynth-0.9.3/ChangeLog 2021-05-10 16:41:01.283234544 +0200
+++ new/qsynth-0.9.4/ChangeLog 2021-07-03 10:48:25.566266927 +0200
@@ -4,6 +4,13 @@
ChangeLog
+0.9.4 2021-07-03 An Early-Summer'21 Release.
+
+- All builds default to Qt6 (Qt >= 6.1) where available.
+
+- CMake is now the new official build system.
+
+
0.9.3 2021-05-11 A Spring'21 Release.
- New Setup/Audio/WASAPI Exclusive Mode option added.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/qsynth-0.9.3/README new/qsynth-0.9.4/README
--- old/qsynth-0.9.3/README 2021-05-10 16:41:01.283234544 +0200
+++ new/qsynth-0.9.4/README 2021-07-03 10:48:25.566266927 +0200
@@ -35,31 +35,16 @@
Installation
------------
-The installation procedure follows the standard for source distributions.
Unpack the tarball and in the extracted source directory:
- ./configure [--prefix=/usr/local]
- make
+ cmake [-DCMAKE_INSTALL_PREFIX=/usr/local] -B build -S .
+ make -C build
and optionally as root:
- make install
+ sudo make -C build install
-This procedure will end installing the following files:
-
- ${prefix}/bin/qsynth
- ${prefix}/share/pixmaps/qsynth.png
- ${prefix}/share/applications/qsynth.desktop
- ${prefix}/share/locale/qsynth_*.qm
-
-Just launch ${prefix}/bin/qsynth and you're off (hopefully).
-
-Note that the default installation path ${prefix} is /usr/local.
-
-If you're checking out from Git, you'll have to prepare the
-configure script just before you proceed with the above instructions:
-
- ./autogen.sh
+See also the README.cmake file in the source distribution.
Configuration
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/qsynth-0.9.3/README.cmake
new/qsynth-0.9.4/README.cmake
--- old/qsynth-0.9.3/README.cmake 2021-05-10 16:41:01.283234544 +0200
+++ new/qsynth-0.9.4/README.cmake 2021-07-03 10:48:25.566266927 +0200
@@ -22,7 +22,7 @@
How to use it?
==============
-1. You need CMake 3.10 or newer to build Qsynth
+1. You need CMake 3.13 or newer to build Qsynth
2. Unpack the Qsynth sources somewhere, or checkout the repository,
and create a build directory. For instance, using a command line shell:
@@ -120,8 +120,3 @@
If there is an error executing the build process, after running a flawless
CMake
configuration process, this means that there may be an error in the source
code,
or in the build system, or something incompatible in 3rd party libraries.
-
-The CMake build system for Qsynth is experimental. It will take a while
-until it becomes stable and fully tested. You can help providing feedback,
-please send a report containing your problems to the Qsynth development
-mailing list, https://lists.sourceforge.net/mailman/listinfo/qsynth-devel
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/qsynth-0.9.3/configure new/qsynth-0.9.4/configure
--- old/qsynth-0.9.3/configure 2021-05-10 16:41:19.939233885 +0200
+++ new/qsynth-0.9.4/configure 2021-07-03 10:48:44.399266262 +0200
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for Qsynth 0.9.3.
+# Generated by GNU Autoconf 2.69 for Qsynth 0.9.4.
#
# Report bugs to <rn...@rncbc.org>.
#
@@ -580,8 +580,8 @@
# Identity of this package.
PACKAGE_NAME='Qsynth'
PACKAGE_TARNAME='qsynth'
-PACKAGE_VERSION='0.9.3'
-PACKAGE_STRING='Qsynth 0.9.3'
+PACKAGE_VERSION='0.9.4'
+PACKAGE_STRING='Qsynth 0.9.4'
PACKAGE_BUGREPORT='rn...@rncbc.org'
PACKAGE_URL=''
@@ -660,7 +660,7 @@
LDFLAGS
CFLAGS
CC
-ac_debug
+ac_build_type
ac_mandir
ac_datadir
ac_libdir
@@ -1280,7 +1280,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures Qsynth 0.9.3 to adapt to many kinds of systems.
+\`configure' configures Qsynth 0.9.4 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1341,7 +1341,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of Qsynth 0.9.3:";;
+ short | recursive ) echo "Configuration of Qsynth 0.9.4:";;
esac
cat <<\_ACEOF
@@ -1350,7 +1350,7 @@
--disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no)
--enable-FEATURE[=ARG] include FEATURE [ARG=yes]
--enable-debug enable debugging (default=no)
- --enable-qt6 enable Qt6 build (default=no)
+ --enable-qt6 enable Qt6 build (default=yes)
--enable-system-tray enable system tray (default=yes)
--enable-fluid-channel-info
enable FluidSynth channel info support (DEPRECATED)
@@ -1461,7 +1461,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-Qsynth configure 0.9.3
+Qsynth configure 0.9.4
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1905,7 +1905,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by Qsynth $as_me 0.9.3, which was
+It was created by Qsynth $as_me 0.9.4, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -2369,7 +2369,7 @@
if test "${enable_qt6+set}" = set; then :
enableval=$enable_qt6; ac_qt6="$enableval"
else
- ac_qt6="no"
+ ac_qt6="yes"
fi
@@ -2379,10 +2379,10 @@
$as_echo "#define CONFIG_DEBUG 1" >>confdefs.h
ac_stacktrace="yes"
- ac_debug="debug"
+ ac_build_type="debug"
else
ac_stacktrace="no"
- ac_debug="release"
+ ac_build_type="release"
fi
@@ -7985,7 +7985,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by Qsynth $as_me 0.9.3, which was
+This file was extended by Qsynth $as_me 0.9.4, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -8047,7 +8047,7 @@
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //;
s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-Qsynth config.status 0.9.3
+Qsynth config.status 0.9.4
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
@@ -8761,7 +8761,7 @@
echo
echo " $PACKAGE_NAME $ac_build_version (Qt $ac_qt_version)"
echo
-echo " Build target . . . . . . . . . . . . . . . . . . .: $ac_debug"
+echo " Build target . . . . . . . . . . . . . . . . . . .: $ac_build_type"
echo
echo " FluidSynth library support . . . . . . . . . . . .: $ac_fluidsynth_lib"
echo " FluidSynth server support . . . . . . . . . . . .: $ac_fluid_server"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/qsynth-0.9.3/configure.ac
new/qsynth-0.9.4/configure.ac
--- old/qsynth-0.9.3/configure.ac 2021-05-10 16:41:01.284234544 +0200
+++ new/qsynth-0.9.4/configure.ac 2021-07-03 10:48:25.567266927 +0200
@@ -1,5 +1,5 @@
# Process this file with autoconf to produce a configure script.
-AC_INIT(Qsynth, 0.9.3, rn...@rncbc.org, qsynth)
+AC_INIT(Qsynth, 0.9.4, rn...@rncbc.org, qsynth)
AC_CONFIG_SRCDIR(src/qsynth.cpp)
AC_CONFIG_HEADERS(src/config.h)
@@ -71,20 +71,20 @@
# Enable Qt6 build preference.
AC_ARG_ENABLE(qt6,
- AS_HELP_STRING([--enable-qt6], [enable Qt6 build (default=no)]),
+ AS_HELP_STRING([--enable-qt6], [enable Qt6 build (default=yes)]),
[ac_qt6="$enableval"],
- [ac_qt6="no"])
+ [ac_qt6="yes"])
if test "x$ac_debug" = "xyes"; then
AC_DEFINE(CONFIG_DEBUG, 1, [Define if debugging is enabled.])
ac_stacktrace="yes"
- ac_debug="debug"
+ ac_build_type="debug"
else
ac_stacktrace="no"
- ac_debug="release"
+ ac_build_type="release"
fi
-AC_SUBST(ac_debug)
+AC_SUBST(ac_build_type)
# Enable system tray argument option.
@@ -629,7 +629,7 @@
echo
echo " $PACKAGE_NAME $ac_build_version (Qt $ac_qt_version)"
echo
-echo " Build target . . . . . . . . . . . . . . . . . . .: $ac_debug"
+echo " Build target . . . . . . . . . . . . . . . . . . .: $ac_build_type"
echo
echo " FluidSynth library support . . . . . . . . . . . .: $ac_fluidsynth_lib"
echo " FluidSynth server support . . . . . . . . . . . .: $ac_fluid_server"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/qsynth-0.9.3/qsynth.spec.in
new/qsynth-0.9.4/qsynth.spec.in
--- old/qsynth-0.9.3/qsynth.spec.in 2021-05-10 16:41:01.284234544 +0200
+++ new/qsynth-0.9.4/qsynth.spec.in 2021-07-03 10:48:25.567266927 +0200
@@ -17,7 +17,7 @@
%define name @PACKAGE_TARNAME@
%define version @PACKAGE_VERSION@
-%define release 47
+%define release 48.1
%define _prefix @ac_prefix@
@@ -25,6 +25,12 @@
%define debug_package %{nil}
%endif
+%if 0%{?fedora_version} >= 34 || 0%{?suse_version} > 1500
+%define qt_major_version 6
+%else
+%define qt_major_version 5
+%endif
+
Summary: A fluidsynth Qt GUI Interface
Name: %{name}
Version: %{version}
@@ -43,16 +49,39 @@
BuildRequires: gcc-c++
BuildRequires: cmake
%if %{defined fedora}
-BuildRequires: qt5-qtbase-devel >= 5.1, qt5-linguist
-BuildRequires: qt5-qtsvg-devel, qt5-qtwayland-devel
+%if 0%{qt_major_version} == 6
+BuildRequires: qt6-qtbase-devel >= 6.1
+BuildRequires: qt6-qttools-devel
+BuildRequires: qt6-qtwayland-devel
+BuildRequires: qt6-qtsvg-devel
+BuildRequires: qt6-linguist
+%else
+BuildRequires: qt5-qtbase-devel >= 5.1
+BuildRequires: qt5-qttools-devel
+BuildRequires: qt5-qtwayland-devel
+BuildRequires: qt5-qtsvg-devel
+BuildRequires: qt5-linguist
+%endif
+BuildRequires: jack-audio-connection-kit-devel
BuildRequires: alsa-lib-devel
%else
-BuildRequires: libqt5-qtbase-devel >= 5.1, libqt5-linguist-devel
-BuildRequires: libqt5-qtsvg-devel, libqt5-qtwayland-devel
+%if 0%{qt_major_version} == 6
+BuildRequires: qt6-base-devel >= 6.1
+BuildRequires: qt6-tools-devel
+BuildRequires: qt6-wayland-devel
+BuildRequires: qt6-svg-devel
+BuildRequires: qt6-linguist-devel
+%else
+BuildRequires: libqt5-qtbase-devel >= 5.1
+BuildRequires: libqt5-qttools-devel
+BuildRequires: libqt5-qtwayland-devel
+BuildRequires: libqt5-qtsvg-devel
+BuildRequires: libqt5-linguist-devel
+%endif
+BuildRequires: libjack-devel
BuildRequires: alsa-devel
%endif
BuildRequires: libfluidsynth-devel
-BuildRequires: libjack-devel
%description
Qsynth is a fluidsynth GUI front-end application, written in C++ around the
@@ -64,11 +93,11 @@
%setup -q
%build
-cmake -DCMAKE_INSTALL_PREFIX=%{_prefix} .
-%__make %{?_smp_mflags}
+cmake -DCMAKE_INSTALL_PREFIX=%{_prefix} -Wno-dev -B build -S .
+%__make %{?_smp_mflags} -C build
%install
-%__make DESTDIR="%{buildroot}" install
+%__make DESTDIR="%{buildroot}" -C build install
%clean
[ -d "%{buildroot}" -a "%{buildroot}" != "/" ] && %__rm -rf "%{buildroot}"
@@ -99,6 +128,8 @@
%{_datadir}/man/fr/man1/%{name}.1.gz
%changelog
+* Sun Jul 4 2021 Rui Nuno Capela <rn...@rncbc.org> 0.9.4
+- Early-Summer'21 release.
* Tue May 11 2021 Rui Nuno Capela <rn...@rncbc.org> 0.9.3
- Spring'21 release.
* Sun Mar 14 2021 Rui Nuno Capela <rn...@rncbc.org> 0.9.2
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/qsynth-0.9.3/src/CMakeLists.txt
new/qsynth-0.9.4/src/CMakeLists.txt
--- old/qsynth-0.9.3/src/CMakeLists.txt 2021-05-10 16:41:01.284234544 +0200
+++ new/qsynth-0.9.4/src/CMakeLists.txt 2021-07-03 10:48:25.567266927 +0200
@@ -1,14 +1,14 @@
-# project(qsynth)
+# project (qsynth)
-set(CMAKE_INCLUDE_CURRENT_DIR ON)
+set (CMAKE_INCLUDE_CURRENT_DIR ON)
-set(CMAKE_AUTOUIC ON)
-set(CMAKE_AUTOMOC ON)
-set(CMAKE_AUTORCC ON)
+set (CMAKE_AUTOUIC ON)
+set (CMAKE_AUTOMOC ON)
+set (CMAKE_AUTORCC ON)
if (EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/config.h)
- file(REMOVE ${CMAKE_CURRENT_SOURCE_DIR}/config.h)
-endif()
+ file (REMOVE ${CMAKE_CURRENT_SOURCE_DIR}/config.h)
+endif ()
configure_file (cmake_config.h.in ${CMAKE_CURRENT_BINARY_DIR}/config.h)
set (HEADERS
@@ -123,6 +123,12 @@
${RESOURCES}
)
+# Add some debugger flags.
+if (CONFIG_DEBUG AND UNIX AND NOT APPLE)
+ target_compile_options (${PROJECT_NAME} PRIVATE -g -fsanitize=address
-fno-omit-frame-pointer)
+ target_link_libraries (${PROJECT_NAME} PRIVATE asan)
+endif ()
+
set_target_properties (${PROJECT_NAME} PROPERTIES CXX_STANDARD 17)
if (WIN32)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/qsynth-0.9.3/src/macOS/creadmg.sh
new/qsynth-0.9.4/src/macOS/creadmg.sh
--- old/qsynth-0.9.3/src/macOS/creadmg.sh 2021-05-10 16:41:01.286234544
+0200
+++ new/qsynth-0.9.4/src/macOS/creadmg.sh 2021-07-03 10:48:25.569266926
+0200
@@ -2,7 +2,7 @@
# create-dmg is available from Homebrew and
https://github.com/create-dmg/create-dmg
NAME="qsynth"
-FULLNAME="${NAME}-0.9.1-mac-x64"
+FULLNAME="${NAME}-0.9.3-47.mac-x64"
CURDIR=$(pushd `dirname $0`>/dev/null; pwd; popd>/dev/null)
BINDIR=`pwd`
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/qsynth-0.9.3/src/qsynth.cpp
new/qsynth-0.9.4/src/qsynth.cpp
--- old/qsynth-0.9.3/src/qsynth.cpp 2021-05-10 16:41:01.286234544 +0200
+++ new/qsynth-0.9.4/src/qsynth.cpp 2021-07-03 10:48:25.569266926 +0200
@@ -1,7 +1,7 @@
// qsynth.cpp
//
/****************************************************************************
- Copyright (C) 2003-2020, rncbc aka Rui Nuno Capela. All rights reserved.
+ Copyright (C) 2003-2021, rncbc aka Rui Nuno Capela. All rights reserved.
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
@@ -480,6 +480,9 @@
::signal(SIGBUS, stacktrace);
#endif
#endif
+#if defined(Q_OS_LINUX)
+ ::setenv("QT_QPA_PLATFORM", "xcb", 0);
+#endif
#if QT_VERSION >= QT_VERSION_CHECK(5, 6, 0)
#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
QApplication::setAttribute(Qt::AA_EnableHighDpiScaling);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/qsynth-0.9.3/src/qsynth.h
new/qsynth-0.9.4/src/qsynth.h
--- old/qsynth-0.9.3/src/qsynth.h 2021-05-10 16:41:01.286234544 +0200
+++ new/qsynth-0.9.4/src/qsynth.h 2021-07-03 10:48:25.569266926 +0200
@@ -1,7 +1,7 @@
// qsynth.h
//
/****************************************************************************
- Copyright (C) 2003-2020, rncbc aka Rui Nuno Capela. All rights reserved.
+ Copyright (C) 2003-2021, rncbc aka Rui Nuno Capela. All rights reserved.
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/qsynth-0.9.3/src/src.pri.in
new/qsynth-0.9.4/src/src.pri.in
--- old/qsynth-0.9.3/src/src.pri.in 2021-05-10 16:41:01.290234544 +0200
+++ new/qsynth-0.9.4/src/src.pri.in 2021-07-03 10:48:25.573266926 +0200
@@ -7,7 +7,7 @@
MANDIR = @ac_mandir@
VERSION = @ac_version@
-CONFIG += @ac_debug@
+CONFIG += @ac_build_type@
INCLUDEPATH += @ac_incpath@
LIBS += @ac_libs@
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/qsynth-0.9.3/src/translations/qsynth_cs.ts
new/qsynth-0.9.4/src/translations/qsynth_cs.ts
--- old/qsynth-0.9.3/src/translations/qsynth_cs.ts 2021-05-10
16:41:01.290234544 +0200
+++ new/qsynth-0.9.4/src/translations/qsynth_cs.ts 2021-07-03
10:48:25.573266926 +0200
@@ -41,7 +41,7 @@
<message>
<location filename="../qsynthOptions.cpp" line="213"/>
<source>Attempt to connect the jack outputs to the physical
ports</source>
- <translation>Pokusit se spojit v??stupy JACK s fyzick??mi
p????pojkami</translation>
+ <translation>Pokusit o spojen?? v??stup?? JACK s fyzick??mi
p????pojkami</translation>
</message>
<message>
<location filename="../qsynthOptions.cpp" line="215"/>
@@ -101,7 +101,7 @@
<message>
<location filename="../qsynthOptions.cpp" line="237"/>
<source>Dump midi router events</source>
- <translation>Vytisknout ud??losti sm??rova??e MIDI</translation>
+ <translation>Zobrazit ud??losti sm??rova??e MIDI</translation>
</message>
<message>
<location filename="../qsynthOptions.cpp" line="239"/>
@@ -1738,37 +1738,37 @@
<message>
<location filename="../qsynthSetupForm.ui" line="112"/>
<source>MIDI &Driver:</source>
- <translation type="unfinished"></translation>
+ <translation>&Ovlada?? MIDI:</translation>
</message>
<message>
<location filename="../qsynthSetupForm.ui" line="148"/>
<source>MIDI D&evice:</source>
- <translation type="unfinished"></translation>
+ <translation>&Za????zen?? MIDI:</translation>
</message>
<message>
<location filename="../qsynthSetupForm.ui" line="292"/>
<source>MIDI Client &Name ID (ALSA/CoreMidi):</source>
- <translation type="unfinished"></translation>
+ <translation>ID &n??zvu klienta MIDI (ALSA/CoreMidi):</translation>
</message>
<message>
<location filename="../qsynthSetupForm.ui" line="340"/>
<source>Attempt to connect the MIDI inputs to the physical
ports</source>
- <translation type="unfinished"></translation>
+ <translation>Pokusit o spojen?? v??stup?? MIDI s fyzick??mi
p????pojkami</translation>
</message>
<message>
<location filename="../qsynthSetupForm.ui" line="343"/>
<source>&Auto Connect MIDI Inputs</source>
- <translation type="unfinished"></translation>
+ <translation>&Automaticky spojit vstupy MIDI</translation>
</message>
<message>
<location filename="../qsynthSetupForm.ui" line="363"/>
<source>D&ump MIDI router events</source>
- <translation type="unfinished"></translation>
+ <translation>&Zobrazit ud??losti sm??rova??e MIDI</translation>
</message>
<message>
<location filename="../qsynthSetupForm.ui" line="395"/>
<source>Audio &Driver:</source>
- <translation type="unfinished"></translation>
+ <translation>O&vlada?? zvuku:</translation>
</message>
<message>
<location filename="../qsynthSetupForm.ui" line="431"/>
@@ -1939,22 +1939,22 @@
<message>
<location filename="../qsynthSetupForm.ui" line="823"/>
<source>Attempt to connect the JACK outputs to the physical
ports</source>
- <translation>Pokusit se spojit v??stupy JACK s fyzick??mi
p????pojkami</translation>
+ <translation>Pokusit o spojen?? v??stup?? JACK s fyzick??mi
p????pojkami</translation>
</message>
<message>
<location filename="../qsynthSetupForm.ui" line="618"/>
<source>Audio D&evice:</source>
- <translation type="unfinished"></translation>
+ <translation>Zvukov?? z&a????zen??:</translation>
</message>
<message>
<location filename="../qsynthSetupForm.ui" line="772"/>
<source>JACK Client &Name ID:</source>
- <translation type="unfinished"></translation>
+ <translation>ID &n??zvu klienta JACK:</translation>
</message>
<message>
<location filename="../qsynthSetupForm.ui" line="826"/>
<source>&Auto Connect JACK Outputs</source>
- <translation type="unfinished"></translation>
+ <translation>&Automaticky spojit v??stupy JACK</translation>
</message>
<message>
<location filename="../qsynthSetupForm.ui" line="833"/>
@@ -1969,7 +1969,7 @@
<message>
<location filename="../qsynthSetupForm.ui" line="859"/>
<source>&WASAPI Exclusive Mode</source>
- <translation type="unfinished"></translation>
+ <translation>Uzav??en?? re??im &WASAPI</translation>
</message>
<message>
<location filename="../qsynthSetupForm.ui" line="867"/>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/qsynth-0.9.3/src/translations/qsynth_fr.ts
new/qsynth-0.9.4/src/translations/qsynth_fr.ts
--- old/qsynth-0.9.3/src/translations/qsynth_fr.ts 2021-05-10
16:41:01.291234544 +0200
+++ new/qsynth-0.9.4/src/translations/qsynth_fr.ts 2021-07-03
10:48:25.574266926 +0200
@@ -1737,37 +1737,37 @@
<message>
<location filename="../qsynthSetupForm.ui" line="112"/>
<source>MIDI &Driver:</source>
- <translation type="unfinished"></translation>
+ <translation>&Pilote MIDI :</translation>
</message>
<message>
<location filename="../qsynthSetupForm.ui" line="148"/>
<source>MIDI D&evice:</source>
- <translation type="unfinished"></translation>
+ <translation>P??riph??riqu&e MIDI :</translation>
</message>
<message>
<location filename="../qsynthSetupForm.ui" line="292"/>
<source>MIDI Client &Name ID (ALSA/CoreMidi):</source>
- <translation type="unfinished"></translation>
+ <translation>&Nom du client MIDI ID (ALSA/CoreMidi) :</translation>
</message>
<message>
<location filename="../qsynthSetupForm.ui" line="340"/>
<source>Attempt to connect the MIDI inputs to the physical
ports</source>
- <translation type="unfinished"></translation>
+ <translation>Essaie de connecter les entr??es MIDI aux ports
physiques</translation>
</message>
<message>
<location filename="../qsynthSetupForm.ui" line="343"/>
<source>&Auto Connect MIDI Inputs</source>
- <translation type="unfinished"></translation>
+ <translation>&Auto-connecte les entr??es MIDI</translation>
</message>
<message>
<location filename="../qsynthSetupForm.ui" line="363"/>
<source>D&ump MIDI router events</source>
- <translation type="unfinished"></translation>
+ <translation>D&umper les ??v??nements du routeur MIDI</translation>
</message>
<message>
<location filename="../qsynthSetupForm.ui" line="395"/>
<source>Audio &Driver:</source>
- <translation type="unfinished"></translation>
+ <translation>Pilote au&dio :</translation>
</message>
<message>
<location filename="../qsynthSetupForm.ui" line="431"/>
@@ -1943,17 +1943,17 @@
<message>
<location filename="../qsynthSetupForm.ui" line="618"/>
<source>Audio D&evice:</source>
- <translation type="unfinished"></translation>
+ <translation>P??riph??riqu&e audio</translation>
</message>
<message>
<location filename="../qsynthSetupForm.ui" line="772"/>
<source>JACK Client &Name ID:</source>
- <translation type="unfinished"></translation>
+ <translation>&Nom du client JACK ID</translation>
</message>
<message>
<location filename="../qsynthSetupForm.ui" line="826"/>
<source>&Auto Connect JACK Outputs</source>
- <translation type="unfinished"></translation>
+ <translation>&Auto-connecte les sorties JACK</translation>
</message>
<message>
<location filename="../qsynthSetupForm.ui" line="833"/>
@@ -1968,7 +1968,7 @@
<message>
<location filename="../qsynthSetupForm.ui" line="859"/>
<source>&WASAPI Exclusive Mode</source>
- <translation type="unfinished"></translation>
+ <translation>Mode exclusif &WASAPI</translation>
</message>
<message>
<location filename="../qsynthSetupForm.ui" line="867"/>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/qsynth-0.9.3/src/win32/setup.nsi.in
new/qsynth-0.9.4/src/win32/setup.nsi.in
--- old/qsynth-0.9.3/src/win32/setup.nsi.in 2021-05-10 16:41:01.291234544
+0200
+++ new/qsynth-0.9.4/src/win32/setup.nsi.in 2021-07-03 10:48:25.575266926
+0200
@@ -63,7 +63,7 @@
!insertmacro MUI_LANGUAGE "Spanish"
# Installer attributes
-OutFile qsynth-${VERSION}-setup.exe
+OutFile qsynth-${VERSION}-47.win-x64-setup.exe
#InstallDir $PROGRAMFILES\QSynth
CRCCheck on
XPStyle on
@@ -83,12 +83,12 @@
# Installer sections
Section -Main SEC0000
- CreateDirectory $INSTDIR\bearer
- CreateDirectory $INSTDIR\iconengines
- CreateDirectory $INSTDIR\imageformats
- CreateDirectory $INSTDIR\platforms
- CreateDirectory $INSTDIR\styles
- CreateDirectory $INSTDIR\translations
+# CreateDirectory $INSTDIR\bearer
+ CreateDirectory $INSTDIR\iconengines
+ CreateDirectory $INSTDIR\imageformats
+ CreateDirectory $INSTDIR\platforms
+ CreateDirectory $INSTDIR\styles
+ CreateDirectory $INSTDIR\translations
SetOutPath $INSTDIR
SetOverwrite on
File ${BINARY_FILES}\qsynth.exe
@@ -100,44 +100,55 @@
File ${BINARY_FILES}\qsynth_fr.qm
File ${BINARY_FILES}\qsynth_ru.qm
File ${BINARY_FILES}\qsynth_sr.qm
- File ${BINARY_FILES}\translations\qt_cs.qm
- File ${BINARY_FILES}\translations\qt_de.qm
- File ${BINARY_FILES}\translations\qt_es.qm
- File ${BINARY_FILES}\translations\qt_fr.qm
- File ${BINARY_FILES}\translations\qt_ru.qm
-
- !insertmacro InstallLib DLL NOTSHARED REBOOT_PROTECTED
${FUIDSYNTH_FILES}\libfluidsynth-2.dll $INSTDIR\libfluidsynth-2.dll $INSTDIR
- !insertmacro InstallLib DLL NOTSHARED REBOOT_PROTECTED
${FUIDSYNTH_FILES}\libglib-2.0-0.dll $INSTDIR\libglib-2.0-0.dll $INSTDIR
- !insertmacro InstallLib DLL NOTSHARED REBOOT_PROTECTED
${FUIDSYNTH_FILES}\libgobject-2.0-0.dll $INSTDIR\libgobject-2.0-0.dll $INSTDIR
- !insertmacro InstallLib DLL NOTSHARED REBOOT_PROTECTED
${FUIDSYNTH_FILES}\libgthread-2.0-0.dll $INSTDIR\libgthread-2.0-0.dll $INSTDIR
- !insertmacro InstallLib DLL NOTSHARED REBOOT_PROTECTED
${FUIDSYNTH_FILES}\libinstpatch-2.dll $INSTDIR\libinstpatch-2.dll $INSTDIR
- !insertmacro InstallLib DLL NOTSHARED REBOOT_PROTECTED
${FUIDSYNTH_FILES}\libintl-8.dll $INSTDIR\libintl-8.dll $INSTDIR
- !insertmacro InstallLib DLL NOTSHARED REBOOT_PROTECTED
${FUIDSYNTH_FILES}\libsndfile-1.dll $INSTDIR\libsndfile-1.dll $INSTDIR
- !insertmacro InstallLib DLL NOTSHARED REBOOT_PROTECTED
${BINARY_FILES}\Qt5Core.dll $INSTDIR\Qt5Core.dll $INSTDIR
- !insertmacro InstallLib DLL NOTSHARED REBOOT_PROTECTED
${BINARY_FILES}\Qt5Gui.dll $INSTDIR\Qt5Gui.dll $INSTDIR
- !insertmacro InstallLib DLL NOTSHARED REBOOT_PROTECTED
${BINARY_FILES}\Qt5Network.dll $INSTDIR\Qt5Network.dll $INSTDIR
- !insertmacro InstallLib DLL NOTSHARED REBOOT_PROTECTED
${BINARY_FILES}\Qt5Svg.dll $INSTDIR\Qt5Svg.dll $INSTDIR
- !insertmacro InstallLib DLL NOTSHARED REBOOT_PROTECTED
${BINARY_FILES}\Qt5Widgets.dll $INSTDIR\Qt5Widgets.dll $INSTDIR
- !insertmacro InstallLib DLL NOTSHARED REBOOT_PROTECTED
${BINARY_FILES}\libGLESv2.dll $INSTDIR\libGLESv2.dll $INSTDIR
- !insertmacro InstallLib DLL NOTSHARED REBOOT_PROTECTED
${BINARY_FILES}\libEGL.dll $INSTDIR\libEGL.dll $INSTDIR
+ File ${BINARY_FILES}\translations\qt_cs.qm
+ File ${BINARY_FILES}\translations\qt_de.qm
+ File ${BINARY_FILES}\translations\qt_es.qm
+ File ${BINARY_FILES}\translations\qt_fr.qm
+ File ${BINARY_FILES}\translations\qt_ru.qm
+
+ !insertmacro InstallLib DLL NOTSHARED REBOOT_PROTECTED
${FUIDSYNTH_FILES}\libfluidsynth-3.dll $INSTDIR\libfluidsynth-3.dll $INSTDIR
+ !insertmacro InstallLib DLL NOTSHARED REBOOT_PROTECTED
${FUIDSYNTH_FILES}\libFLAC-8.dll $INSTDIR\libFLAC-8.dll $INSTDIR
+ !insertmacro InstallLib DLL NOTSHARED REBOOT_PROTECTED
${FUIDSYNTH_FILES}\libglib-2.0-0.dll $INSTDIR\libglib-2.0-0.dll $INSTDIR
+ !insertmacro InstallLib DLL NOTSHARED REBOOT_PROTECTED
${FUIDSYNTH_FILES}\libgomp-1.dll $INSTDIR\libgomp-1.dll $INSTDIR
+ !insertmacro InstallLib DLL NOTSHARED REBOOT_PROTECTED
${FUIDSYNTH_FILES}\libiconv-2.dll $INSTDIR\libiconv-2.dll $INSTDIR
+ !insertmacro InstallLib DLL NOTSHARED REBOOT_PROTECTED
${FUIDSYNTH_FILES}\libintl-8.dll $INSTDIR\libintl-8.dll $INSTDIR
+ !insertmacro InstallLib DLL NOTSHARED REBOOT_PROTECTED
${FUIDSYNTH_FILES}\libogg-0.dll $INSTDIR\libogg-0.dll $INSTDIR
+ !insertmacro InstallLib DLL NOTSHARED REBOOT_PROTECTED
${FUIDSYNTH_FILES}\libopus-0.dll $INSTDIR\libopus-0.dll $INSTDIR
+ !insertmacro InstallLib DLL NOTSHARED REBOOT_PROTECTED
${FUIDSYNTH_FILES}\libpcre-1.dll $INSTDIR\libpcre-1.dll $INSTDIR
+ !insertmacro InstallLib DLL NOTSHARED REBOOT_PROTECTED
${FUIDSYNTH_FILES}\libreadline8.dll $INSTDIR\libreadline8.dll $INSTDIR
+ !insertmacro InstallLib DLL NOTSHARED REBOOT_PROTECTED
${FUIDSYNTH_FILES}\libsndfile-1.dll $INSTDIR\libsndfile-1.dll $INSTDIR
+ !insertmacro InstallLib DLL NOTSHARED REBOOT_PROTECTED
${FUIDSYNTH_FILES}\libssp-0.dll $INSTDIR\libssp-0.dll $INSTDIR
+ !insertmacro InstallLib DLL NOTSHARED REBOOT_PROTECTED
${FUIDSYNTH_FILES}\libtermcap-0.dll $INSTDIR\libtermcap-0.dll $INSTDIR
+ !insertmacro InstallLib DLL NOTSHARED REBOOT_PROTECTED
${FUIDSYNTH_FILES}\libvorbis-0.dll $INSTDIR\libvorbis-0.dll $INSTDIR
+ !insertmacro InstallLib DLL NOTSHARED REBOOT_PROTECTED
${FUIDSYNTH_FILES}\libvorbisenc-2.dll $INSTDIR\libvorbisenc-2.dll $INSTDIR
+
+ !insertmacro InstallLib DLL NOTSHARED REBOOT_PROTECTED
${BINARY_FILES}\Qt6Core.dll $INSTDIR\Qt6Core.dll $INSTDIR
+ !insertmacro InstallLib DLL NOTSHARED REBOOT_PROTECTED
${BINARY_FILES}\Qt6Gui.dll $INSTDIR\Qt6Gui.dll $INSTDIR
+ !insertmacro InstallLib DLL NOTSHARED REBOOT_PROTECTED
${BINARY_FILES}\Qt6Network.dll $INSTDIR\Qt6Network.dll $INSTDIR
+ !insertmacro InstallLib DLL NOTSHARED REBOOT_PROTECTED
${BINARY_FILES}\Qt6Svg.dll $INSTDIR\Qt6Svg.dll $INSTDIR
+ !insertmacro InstallLib DLL NOTSHARED REBOOT_PROTECTED
${BINARY_FILES}\Qt6Widgets.dll $INSTDIR\Qt6Widgets.dll $INSTDIR
+
+# !insertmacro InstallLib DLL NOTSHARED REBOOT_PROTECTED
${BINARY_FILES}\libGLESv2.dll $INSTDIR\libGLESv2.dll $INSTDIR
+# !insertmacro InstallLib DLL NOTSHARED REBOOT_PROTECTED
${BINARY_FILES}\libEGL.dll $INSTDIR\libEGL.dll $INSTDIR
+
!insertmacro InstallLib DLL NOTSHARED REBOOT_PROTECTED
${BINARY_FILES}\D3Dcompiler_47.dll $INSTDIR\D3Dcompiler_47.dll $INSTDIR
!insertmacro InstallLib DLL NOTSHARED REBOOT_PROTECTED
${BINARY_FILES}\opengl32sw.dll $INSTDIR\opengl32sw.dll $INSTDIR
!insertmacro InstallLib DLL NOTSHARED REBOOT_PROTECTED
${BINARY_FILES}\libgcc_s_seh-1.dll $INSTDIR\libgcc_s_seh-1.dll $INSTDIR
!insertmacro InstallLib DLL NOTSHARED REBOOT_PROTECTED
${BINARY_FILES}\libstdc++-6.dll $INSTDIR\libstdc++-6.dll $INSTDIR
!insertmacro InstallLib DLL NOTSHARED REBOOT_PROTECTED
${BINARY_FILES}\libwinpthread-1.dll $INSTDIR\libwinpthread-1.dll $INSTDIR
- !insertmacro InstallLib DLL NOTSHARED REBOOT_PROTECTED
${BINARY_FILES}\bearer\qgenericbearer.dll $INSTDIR\bearer\qgenericbearer.dll
$INSTDIR
- !insertmacro InstallLib DLL NOTSHARED REBOOT_PROTECTED
${BINARY_FILES}\iconengines\qsvgicon.dll $INSTDIR\iconengines\qsvgicon.dll
$INSTDIR
- !insertmacro InstallLib DLL NOTSHARED REBOOT_PROTECTED
${BINARY_FILES}\imageformats\qgif.dll $INSTDIR\imageformats\qgif.dll $INSTDIR
- !insertmacro InstallLib DLL NOTSHARED REBOOT_PROTECTED
${BINARY_FILES}\imageformats\qicns.dll $INSTDIR\imageformats\qicns.dll $INSTDIR
- !insertmacro InstallLib DLL NOTSHARED REBOOT_PROTECTED
${BINARY_FILES}\imageformats\qico.dll $INSTDIR\imageformats\qico.dll $INSTDIR
- !insertmacro InstallLib DLL NOTSHARED REBOOT_PROTECTED
${BINARY_FILES}\imageformats\qjpeg.dll $INSTDIR\imageformats\qjpeg.dll $INSTDIR
- !insertmacro InstallLib DLL NOTSHARED REBOOT_PROTECTED
${BINARY_FILES}\imageformats\qsvg.dll $INSTDIR\imageformats\qsvg.dll $INSTDIR
- !insertmacro InstallLib DLL NOTSHARED REBOOT_PROTECTED
${BINARY_FILES}\imageformats\qtga.dll $INSTDIR\imageformats\qtga.dll $INSTDIR
- !insertmacro InstallLib DLL NOTSHARED REBOOT_PROTECTED
${BINARY_FILES}\imageformats\qtiff.dll $INSTDIR\imageformats\qtiff.dll $INSTDIR
- !insertmacro InstallLib DLL NOTSHARED REBOOT_PROTECTED
${BINARY_FILES}\imageformats\qwbmp.dll $INSTDIR\imageformats\qwbmp.dll $INSTDIR
- !insertmacro InstallLib DLL NOTSHARED REBOOT_PROTECTED
${BINARY_FILES}\imageformats\qwebp.dll $INSTDIR\imageformats\qwebp.dll $INSTDIR
- !insertmacro InstallLib DLL NOTSHARED REBOOT_PROTECTED
${BINARY_FILES}\platforms\qwindows.dll $INSTDIR\platforms\qwindows.dll $INSTDIR
- !insertmacro InstallLib DLL NOTSHARED REBOOT_PROTECTED
${BINARY_FILES}\styles\qwindowsvistastyle.dll
$INSTDIR\styles\qwindowsvistastyle.dll $INSTDIR
+# !insertmacro InstallLib DLL NOTSHARED REBOOT_PROTECTED
${BINARY_FILES}\bearer\qgenericbearer.dll $INSTDIR\bearer\qgenericbearer.dll
$INSTDIR
+ !insertmacro InstallLib DLL NOTSHARED REBOOT_PROTECTED
${BINARY_FILES}\iconengines\qsvgicon.dll $INSTDIR\iconengines\qsvgicon.dll
$INSTDIR
+ !insertmacro InstallLib DLL NOTSHARED REBOOT_PROTECTED
${BINARY_FILES}\imageformats\qgif.dll $INSTDIR\imageformats\qgif.dll $INSTDIR
+# !insertmacro InstallLib DLL NOTSHARED REBOOT_PROTECTED
${BINARY_FILES}\imageformats\qicns.dll $INSTDIR\imageformats\qicns.dll $INSTDIR
+ !insertmacro InstallLib DLL NOTSHARED REBOOT_PROTECTED
${BINARY_FILES}\imageformats\qico.dll $INSTDIR\imageformats\qico.dll $INSTDIR
+ !insertmacro InstallLib DLL NOTSHARED REBOOT_PROTECTED
${BINARY_FILES}\imageformats\qjpeg.dll $INSTDIR\imageformats\qjpeg.dll $INSTDIR
+ !insertmacro InstallLib DLL NOTSHARED REBOOT_PROTECTED
${BINARY_FILES}\imageformats\qsvg.dll $INSTDIR\imageformats\qsvg.dll $INSTDIR
+# !insertmacro InstallLib DLL NOTSHARED REBOOT_PROTECTED
${BINARY_FILES}\imageformats\qtga.dll $INSTDIR\imageformats\qtga.dll $INSTDIR
+# !insertmacro InstallLib DLL NOTSHARED REBOOT_PROTECTED
${BINARY_FILES}\imageformats\qtiff.dll $INSTDIR\imageformats\qtiff.dll $INSTDIR
+# !insertmacro InstallLib DLL NOTSHARED REBOOT_PROTECTED
${BINARY_FILES}\imageformats\qwbmp.dll $INSTDIR\imageformats\qwbmp.dll $INSTDIR
+# !insertmacro InstallLib DLL NOTSHARED REBOOT_PROTECTED
${BINARY_FILES}\imageformats\qwebp.dll $INSTDIR\imageformats\qwebp.dll $INSTDIR
+ !insertmacro InstallLib DLL NOTSHARED REBOOT_PROTECTED
${BINARY_FILES}\platforms\qwindows.dll $INSTDIR\platforms\qwindows.dll $INSTDIR
+ !insertmacro InstallLib DLL NOTSHARED REBOOT_PROTECTED
${BINARY_FILES}\styles\qwindowsvistastyle.dll
$INSTDIR\styles\qwindowsvistastyle.dll $INSTDIR
WriteRegStr HKLM "${REGKEY}\Components" Main 1
SectionEnd
@@ -191,46 +202,57 @@
Delete /REBOOTOK $INSTDIR\fluidsynth.exe
Delete /REBOOTOK $INSTDIR\qsynth.exe
- !insertmacro UnInstallLib DLL NOTSHARED REBOOT_PROTECTED
$INSTDIR\libfluidsynth-2.dll
+ !insertmacro UnInstallLib DLL NOTSHARED REBOOT_PROTECTED
$INSTDIR\libfluidsynth-3.dll
+ !insertmacro UnInstallLib DLL NOTSHARED REBOOT_PROTECTED
$INSTDIR\libFLAC-8.dll
!insertmacro UnInstallLib DLL NOTSHARED REBOOT_PROTECTED
$INSTDIR\libglib-2.0-0.dll
- !insertmacro UnInstallLib DLL NOTSHARED REBOOT_PROTECTED
$INSTDIR\libgobject-2.0-0.dll
- !insertmacro UnInstallLib DLL NOTSHARED REBOOT_PROTECTED
$INSTDIR\libgthread-2.0-0.dll
- !insertmacro UnInstallLib DLL NOTSHARED REBOOT_PROTECTED
$INSTDIR\libinstpatch-2.dll
+ !insertmacro UnInstallLib DLL NOTSHARED REBOOT_PROTECTED
$INSTDIR\libgomp-1.dll
+ !insertmacro UnInstallLib DLL NOTSHARED REBOOT_PROTECTED
$INSTDIR\libiconv-2.dll
!insertmacro UnInstallLib DLL NOTSHARED REBOOT_PROTECTED
$INSTDIR\libintl-8.dll
+ !insertmacro UnInstallLib DLL NOTSHARED REBOOT_PROTECTED
$INSTDIR\libogg-0.dll
+ !insertmacro UnInstallLib DLL NOTSHARED REBOOT_PROTECTED
$INSTDIR\libopus-0.dll
+ !insertmacro UnInstallLib DLL NOTSHARED REBOOT_PROTECTED
$INSTDIR\libpcre-1.dll
+ !insertmacro UnInstallLib DLL NOTSHARED REBOOT_PROTECTED
$INSTDIR\libreadline8.dll
!insertmacro UnInstallLib DLL NOTSHARED REBOOT_PROTECTED
$INSTDIR\libsndfile-1.dll
+ !insertmacro UnInstallLib DLL NOTSHARED REBOOT_PROTECTED
$INSTDIR\libssp-0.dll
+ !insertmacro UnInstallLib DLL NOTSHARED REBOOT_PROTECTED
$INSTDIR\libtermcap-0.dll
+ !insertmacro UnInstallLib DLL NOTSHARED REBOOT_PROTECTED
$INSTDIR\libvorbis-0.dll
+ !insertmacro UnInstallLib DLL NOTSHARED REBOOT_PROTECTED
$INSTDIR\libvorbisenc-2.dll
+
+ !insertmacro UnInstallLib DLL NOTSHARED REBOOT_PROTECTED
$INSTDIR\Qt6Core.dll
+ !insertmacro UnInstallLib DLL NOTSHARED REBOOT_PROTECTED
$INSTDIR\Qt6Gui.dll
+ !insertmacro UnInstallLib DLL NOTSHARED REBOOT_PROTECTED
$INSTDIR\Qt6Network.dll
+ !insertmacro UnInstallLib DLL NOTSHARED REBOOT_PROTECTED
$INSTDIR\Qt6Svg.dll
+ !insertmacro UnInstallLib DLL NOTSHARED REBOOT_PROTECTED
$INSTDIR\Qt6Widgets.dll
+
+# !insertmacro UnInstallLib DLL NOTSHARED REBOOT_PROTECTED
$INSTDIR\libGLESv2.dll
+# !insertmacro UnInstallLib DLL NOTSHARED REBOOT_PROTECTED
$INSTDIR\libEGL.dll
- !insertmacro UnInstallLib DLL NOTSHARED REBOOT_PROTECTED
$INSTDIR\Qt5Core.dll
- !insertmacro UnInstallLib DLL NOTSHARED REBOOT_PROTECTED
$INSTDIR\Qt5Gui.dll
- !insertmacro UnInstallLib DLL NOTSHARED REBOOT_PROTECTED
$INSTDIR\Qt5Network.dll
- !insertmacro UnInstallLib DLL NOTSHARED REBOOT_PROTECTED
$INSTDIR\Qt5Svg.dll
- !insertmacro UnInstallLib DLL NOTSHARED REBOOT_PROTECTED
$INSTDIR\Qt5Widgets.dll
- !insertmacro UnInstallLib DLL NOTSHARED REBOOT_PROTECTED
$INSTDIR\libGLESv2.dll
- !insertmacro UnInstallLib DLL NOTSHARED REBOOT_PROTECTED
$INSTDIR\libEGL.dll
!insertmacro UnInstallLib DLL NOTSHARED REBOOT_PROTECTED
$INSTDIR\D3Dcompiler_47.dll
!insertmacro UnInstallLib DLL NOTSHARED REBOOT_PROTECTED
$INSTDIR\opengl32sw.dll
!insertmacro UnInstallLib DLL NOTSHARED REBOOT_PROTECTED
$INSTDIR\libgcc_s_seh-1.dll
!insertmacro UnInstallLib DLL NOTSHARED REBOOT_PROTECTED
$INSTDIR\libstdc++-6.dll
!insertmacro UnInstallLib DLL NOTSHARED REBOOT_PROTECTED
$INSTDIR\libwinpthread-1.dll
- !insertmacro UnInstallLib DLL NOTSHARED REBOOT_PROTECTED
$INSTDIR\bearer\qgenericbearer.dll
+# !insertmacro UnInstallLib DLL NOTSHARED REBOOT_PROTECTED
$INSTDIR\bearer\qgenericbearer.dll
!insertmacro UnInstallLib DLL NOTSHARED REBOOT_PROTECTED
$INSTDIR\iconengines\qsvgicon.dll
!insertmacro UnInstallLib DLL NOTSHARED REBOOT_PROTECTED
$INSTDIR\imageformats\qgif.dll
- !insertmacro UnInstallLib DLL NOTSHARED REBOOT_PROTECTED
$INSTDIR\imageformats\qicns.dll
+# !insertmacro UnInstallLib DLL NOTSHARED REBOOT_PROTECTED
$INSTDIR\imageformats\qicns.dll
!insertmacro UnInstallLib DLL NOTSHARED REBOOT_PROTECTED
$INSTDIR\imageformats\qico.dll
!insertmacro UnInstallLib DLL NOTSHARED REBOOT_PROTECTED
$INSTDIR\imageformats\qjpeg.dll
!insertmacro UnInstallLib DLL NOTSHARED REBOOT_PROTECTED
$INSTDIR\imageformats\qsvg.dll
- !insertmacro UnInstallLib DLL NOTSHARED REBOOT_PROTECTED
$INSTDIR\imageformats\qtga.dll
- !insertmacro UnInstallLib DLL NOTSHARED REBOOT_PROTECTED
$INSTDIR\imageformats\qtiff.dll
- !insertmacro UnInstallLib DLL NOTSHARED REBOOT_PROTECTED
$INSTDIR\imageformats\qwbmp.dll
- !insertmacro UnInstallLib DLL NOTSHARED REBOOT_PROTECTED
$INSTDIR\imageformats\qwebp.dll
+# !insertmacro UnInstallLib DLL NOTSHARED REBOOT_PROTECTED
$INSTDIR\imageformats\qtga.dll
+# !insertmacro UnInstallLib DLL NOTSHARED REBOOT_PROTECTED
$INSTDIR\imageformats\qtiff.dll
+# !insertmacro UnInstallLib DLL NOTSHARED REBOOT_PROTECTED
$INSTDIR\imageformats\qwbmp.dll
+# !insertmacro UnInstallLib DLL NOTSHARED REBOOT_PROTECTED
$INSTDIR\imageformats\qwebp.dll
!insertmacro UnInstallLib DLL NOTSHARED REBOOT_PROTECTED
$INSTDIR\platforms\qwindows.dll
!insertmacro UnInstallLib DLL NOTSHARED REBOOT_PROTECTED
$INSTDIR\styles\qwindowsvistastyle.dll
- RMDir /REBOOTOK $INSTDIR\translations
- RMDir /REBOOTOK $INSTDIR\styles
- RMDir /REBOOTOK $INSTDIR\platforms
- RMDir /REBOOTOK $INSTDIR\iconengines
- RMDir /REBOOTOK $INSTDIR\imageformats
- RMDir /REBOOTOK $INSTDIR\bearer
+
+ RMDir /REBOOTOK $INSTDIR\translations
+ RMDir /REBOOTOK $INSTDIR\styles
+ RMDir /REBOOTOK $INSTDIR\platforms
+ RMDir /REBOOTOK $INSTDIR\iconengines
+ RMDir /REBOOTOK $INSTDIR\imageformats
+# RMDir /REBOOTOK $INSTDIR\bearer
DeleteRegValue HKLM "${REGKEY}\Components" Main
SectionEnd
@@ -251,12 +273,12 @@
# Installer functions
Function .onInit
!insertmacro MUI_LANGDLL_DISPLAY
- ${If} ${RunningX64}
- StrCpy $INSTDIR "$PROGRAMFILES64\${PROGNAME}"
- ${Else}
- MessageBox MB_OK|MB_ICONSTOP "Sorry, this setup package is for
64 bit systems only."
- Quit
- ${EndIf}
+ ${If} ${RunningX64}
+ StrCpy $INSTDIR "$PROGRAMFILES64\${PROGNAME}"
+ ${Else}
+ MessageBox MB_OK|MB_ICONSTOP "Sorry, this setup package is for 64 bit
systems only."
+ Quit
+ ${EndIf}
Call GetDXVersion
Pop $R3
IntCmp $R3 900 +3 0 +3
