From 10645e1aef9e1e15ebcdf02515e410ad967bc9b8 Mon Sep 17 00:00:00 2001
From: Erich Eickmeyer <erich@ericheickmeyer.com>
Date: Apr 26 2020 20:05:17 +0000
Subject: New version 3.9.0


---

diff --git a/.gitignore b/.gitignore
index 3fb4bc1..b8fc929 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /Add64-1.2.2.tar.bz2
+/Add64-3.9.0.tar.bz2
diff --git a/Add64.spec b/Add64.spec
index b872545..137c81e 100644
--- a/Add64.spec
+++ b/Add64.spec
@@ -1,18 +1,21 @@
+%global debug_package %{nil}
+
 Summary:       An additive synthesizer using JACK
 Name:          Add64
-Version:       1.2.2
-Release:       19%{?dist}
+Version:       3.9.0
+Release:       1%{?dist}
 URL:           http://sourceforge.net/projects/add64
 Source0:       http://downloads.sourceforge.net/project/add64/%{name}-%{version}.tar.bz2
 Source1:       %{name}.desktop
 # icon taken from screenshot
 Source2:       add64.png
+Source3:       Makefile
 # gcc7 fix
-Patch0:        Add64-gcc7.patch
+# Patch0:        Add64-gcc7.patch
 License:       GPLv3
 
 BuildRequires: jack-audio-connection-kit-devel
-BuildRequires: qt4-devel
+BuildRequires: qt5-devel
 BuildRequires: desktop-file-utils
 
 %description
@@ -20,14 +23,16 @@ Add64 is an additive synthesizer using Qt and the JACK audio connection kit
 
 %prep
 %setup -q -n %{name}-%{version}
-%patch0 -p1 -b .gcc7
-sed -i -e 's|lib64|%{_lib}|' \
-       -e 's|$(QT_BASE_DIR)/bin|%{_qt4_libdir}/qt4/bin|' \
-       -e 's|-lm|-lm -lstdc++|' \
-       -e 's|-O2 -g -Wall|%{optflags}|' Makefile
-chmod -x * 
+#patch0 -p1 -b .gcc7
+#cp %{SOURCE3} ./
+#sed -i -e 's|lib64|%{_lib}|' \
+#       -e 's|$(QT_BASE_DIR)/bin|%{_qt5_libdir}/qt5/bin|' \
+#       -e 's|-lm|-lm -lstdc++|' \
+#       -e 's|-O2 -g -Wall|%{optflags}|' Makefile
+#chmod -x * 
 
 %build
+%{_qt5_libdir}/qt5/bin/qmake -makefile
 make %{?_smp_mflags}
 
 %install
@@ -79,13 +84,16 @@ SentUpstream: 2014-09-17
 EOF
 
 %files 
-%doc LICENSE README 
+%doc LICENSE 
 %{_bindir}/%{name}
 %{_datadir}/appdata/*.appdata.xml
 %{_datadir}/applications/%{name}.desktop
 %{_datadir}/pixmaps/add64.png
 
 %changelog
+* Sun Apr 26 2020 Erich Eickmeyer <erich@ericheickmeyer.com> - 3.9.0-1
+- New version 3.9.0
+
 * Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.2-19
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
 
diff --git a/Makefile b/Makefile
new file mode 100755
index 0000000..4ac69d9
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,66 @@
+QT_BASE_DIR=/usr
+QT_LIB_DIR=$(QT_BASE_DIR)/lib64
+QT_BIN_DIR=$(QT_BASE_DIR)/bin
+QT_INCLUDE_DIR=$(QT_BASE_DIR)/include
+
+Add64: harmonics.o harmonics.moc.o \
+	filter.o filter.moc.o \
+	gui.o gui.moc.o \
+	multislider.o multislider.moc.o \
+	modslider.o modslider.moc.o \
+	voicesynth.o voicesynth.moc.o \
+	synth.o synth.moc.o \
+	voicedata.o \
+	model.o jackprocessor.o jackprocessor.moc.o main.o
+	gcc -g -o Add64 \
+	harmonics.o harmonics.moc.o \
+	multislider.o multislider.moc.o \
+	modslider.o modslider.moc.o \
+	filter.o filter.moc.o \
+	gui.o gui.moc.o \
+	voicesynth.o voicesynth.moc.o \
+	synth.o synth.moc.o \
+	voicedata.o \
+	model.o jackprocessor.o jackprocessor.moc.o main.o \
+	-L$(QT_LIB_DIR) \
+	-lQtCore -lQtGui -ljack -lm
+
+CXXFLAGS=-I$(QT_INCLUDE_DIR) -I. -O2 -g -Wall
+
+filter.o: filter.cpp filter.h model.h
+filter.moc.o: filter.moc.cpp filter.h model.h 
+filter.moc.cpp: filter.h filter.cpp
+	$(QT_BIN_DIR)/moc filter.h -o filter.moc.cpp
+harmonics.o: harmonics.cpp harmonics.h model.h
+harmonics.moc.o: harmonics.moc.cpp harmonics.h model.h 
+harmonics.moc.cpp: harmonics.h harmonics.cpp
+	$(QT_BIN_DIR)/moc harmonics.h -o harmonics.moc.cpp
+multislider.o: multislider.cpp multislider.h modslider.h model.h
+multislider.moc.o: multislider.moc.cpp multislider.h modslider.h model.h
+multislider.moc.cpp: multislider.h multislider.cpp
+	$(QT_BIN_DIR)/moc multislider.h -o multislider.moc.cpp
+modslider.o: modslider.cpp modslider.h model.h
+modslider.moc.o: modslider.moc.cpp modslider.h model.h 
+modslider.moc.cpp: modslider.h modslider.cpp
+	$(QT_BIN_DIR)/moc modslider.h -o modslider.moc.cpp
+midicontroller.o: midicontroller.cpp midicontroller.h
+controlobject.o: controlobject.cpp controlobject.h
+gui.o: gui.cpp gui.h harmonics.h synth.h model.h multislider.h modslider.h filter.h jackprocessor.h
+gui.moc.o: gui.moc.cpp gui.h harmonics.h synth.h model.h multislider.h modslider.h filter.h jackprocessor.h
+gui.moc.cpp: gui.h gui.cpp 
+	$(QT_BIN_DIR)/moc gui.h -o gui.moc.cpp
+voicesynth.o: voicesynth.cpp voicesynth.h voicedata.h model.h
+voicesynth.moc.o: voicesynth.moc.cpp voicesynth.h voicedata.h model.h
+voicesynth.moc.cpp: voicesynth.h voicesynth.cpp voicedata.h 
+	$(QT_BIN_DIR)/moc voicesynth.h -o voicesynth.moc.cpp
+synth.o: synth.cpp synth.h model.h
+synth.moc.o: synth.moc.cpp synth.h model.h
+synth.moc.cpp: synth.h synth.cpp model.h
+	$(QT_BIN_DIR)/moc synth.h -o synth.moc.cpp
+voicedata.o: voicedata.cpp voicedata.h
+model.o: model.cpp model.h voicedata.h
+jackprocessor.o: jackprocessor.cpp jackprocessor.h model.h
+jackprocessor.moc.o: jackprocessor.moc.cpp jackprocessor.h model.h
+jackprocessor.moc.cpp: jackprocessor.h jackprocessor.cpp model.h
+	$(QT_BIN_DIR)/moc jackprocessor.h -o jackprocessor.moc.cpp
+main.o: main.cpp gui.h model.h
diff --git a/sources b/sources
index 1eaaa94..39e366c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-9799d5b5ca88b04b194d832c29a78c46  Add64-1.2.2.tar.bz2
+SHA512 (Add64-3.9.0.tar.bz2) = fa64d1e4334cd98ca331892d386f9b37571904a2e2dcc863cd738d3f2c4ccee140f07d3c1fccbceb8ac323c882926ebb14e21549c64428a2817067f2544ef86d