aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTobias Kortkamp <tobik@FreeBSD.org>2021-04-08 11:56:57 +0000
committerTobias Kortkamp <tobik@FreeBSD.org>2021-04-08 11:58:58 +0000
commitd3a1e886a884a65b139547cd2ed8c8c0e639dfb1 (patch)
tree161f2fd3305d63a2449a7909f175c152190fca49
parent97ea9a85b58f03a8b27483f5925fc3be9ad4bdea (diff)
downloadports-d3a1e886a884a65b139547cd2ed8c8c0e639dfb1.tar.gz
ports-d3a1e886a884a65b139547cd2ed8c8c0e639dfb1.zip
audio/muse-sequencer: Try to fix build order bug (D29353)
Uncovered while building with devel/samurai but can probably also happen with ninja eventually. There are some missing dependencies on the components module. In file included from /wrkdirs/usr/ports/audio/muse-sequencer/work/muse-muse_3_1_1/muse3/muse/waveedit/wavecanvas.cpp:72: /wrkdirs/usr/ports/audio/muse-sequencer/work/muse-muse_3_1_1/muse3/muse/components/copy_on_write.h:26:10: fatal error: 'ui_copy_on_write_base.h' file not found #include "ui_copy_on_write_base.h" ^~~~~~~~~~~~~~~~~~~~~~~~~ http://package18.nyi.freebsd.org/data/122amd64-default-foo/2021-04-05_21h03m50s/logs/errors/muse-sequencer-3.1.1_1.log https://github.com/michaelforney/samurai/issues/70 PR: 254678 Obtained from: upstream (midieedit, waveedit patches)
-rw-r--r--audio/muse-sequencer/files/patch-muse_instruments_CMakeLists.txt17
-rw-r--r--audio/muse-sequencer/files/patch-muse_liste_CMakeLists.txt17
-rw-r--r--audio/muse-sequencer/files/patch-muse_midiedit_CMakeLists.txt11
-rw-r--r--audio/muse-sequencer/files/patch-muse_mixer_CMakeLists.txt17
-rw-r--r--audio/muse-sequencer/files/patch-muse_waveedit_CMakeLists.txt11
5 files changed, 73 insertions, 0 deletions
diff --git a/audio/muse-sequencer/files/patch-muse_instruments_CMakeLists.txt b/audio/muse-sequencer/files/patch-muse_instruments_CMakeLists.txt
new file mode 100644
index 000000000000..26417c4373a9
--- /dev/null
+++ b/audio/muse-sequencer/files/patch-muse_instruments_CMakeLists.txt
@@ -0,0 +1,17 @@
+In file included from muse/instruments/editinstrument.cpp:58:
+muse/components/editevent.h:26:10: fatal error: 'ui_editnotedialogbase.h' file not found
+#include "ui_editnotedialogbase.h"
+ ^~~~~~~~~~~~~~~~~~~~~~~~~
+1 error generated.
+
+--- muse/instruments/CMakeLists.txt.orig 2021-04-08 11:28:12 UTC
++++ muse/instruments/CMakeLists.txt
+@@ -55,6 +55,8 @@ add_library ( instruments ${MODULES_BUILD}
+ ${instruments_uis}
+ )
+
++add_dependencies(instruments components)
++
+ ##
+ ## Append to the list of translations
+ ##
diff --git a/audio/muse-sequencer/files/patch-muse_liste_CMakeLists.txt b/audio/muse-sequencer/files/patch-muse_liste_CMakeLists.txt
new file mode 100644
index 000000000000..75058f3bacc1
--- /dev/null
+++ b/audio/muse-sequencer/files/patch-muse_liste_CMakeLists.txt
@@ -0,0 +1,17 @@
+In file included from muse/liste/listedit.cpp:37:
+muse/components/editevent.h:26:10: fatal error: 'ui_editnotedialogbase.h' file not found
+#include "ui_editnotedialogbase.h"
+ ^~~~~~~~~~~~~~~~~~~~~~~~~
+1 error generated.
+
+--- muse/liste/CMakeLists.txt.orig 2021-04-08 11:45:21 UTC
++++ muse/liste/CMakeLists.txt
+@@ -43,6 +43,8 @@ add_library ( liste ${MODULES_BUILD}
+ ${liste_mocs}
+ )
+
++add_dependencies(liste components)
++
+ ##
+ ## Append to the list of translations
+ ##
diff --git a/audio/muse-sequencer/files/patch-muse_midiedit_CMakeLists.txt b/audio/muse-sequencer/files/patch-muse_midiedit_CMakeLists.txt
new file mode 100644
index 000000000000..b9c3c7f3e0f1
--- /dev/null
+++ b/audio/muse-sequencer/files/patch-muse_midiedit_CMakeLists.txt
@@ -0,0 +1,11 @@
+--- muse/midiedit/CMakeLists.txt.orig 2020-07-18 10:43:34 UTC
++++ muse/midiedit/CMakeLists.txt
+@@ -71,6 +71,8 @@ add_library ( midiedit ${MODULES_BUILD}
+ ${midiedit_mocs}
+ )
+
++add_dependencies(midiedit components)
++
+ ##
+ ## Append to the list of translations
+ ##
diff --git a/audio/muse-sequencer/files/patch-muse_mixer_CMakeLists.txt b/audio/muse-sequencer/files/patch-muse_mixer_CMakeLists.txt
new file mode 100644
index 000000000000..18ca590410b0
--- /dev/null
+++ b/audio/muse-sequencer/files/patch-muse_mixer_CMakeLists.txt
@@ -0,0 +1,17 @@
+In file included from muse/mixer/rack.cpp:49:
+muse/components/plugindialog.h:4:10: fatal error: 'ui_plugindialogbase.h' file not found
+#include "ui_plugindialogbase.h"
+ ^~~~~~~~~~~~~~~~~~~~~~~
+1 error generated.
+
+--- muse/mixer/CMakeLists.txt.orig 2021-04-08 11:35:45 UTC
++++ muse/mixer/CMakeLists.txt
+@@ -64,6 +64,8 @@ add_library ( mixer ${MODULES_BUILD}
+ ${mixer_uis}
+ )
+
++add_dependencies(mixer components)
++
+ ##
+ ## Append to the list of translations
+ ##
diff --git a/audio/muse-sequencer/files/patch-muse_waveedit_CMakeLists.txt b/audio/muse-sequencer/files/patch-muse_waveedit_CMakeLists.txt
new file mode 100644
index 000000000000..dba285dc0df4
--- /dev/null
+++ b/audio/muse-sequencer/files/patch-muse_waveedit_CMakeLists.txt
@@ -0,0 +1,11 @@
+--- muse/waveedit/CMakeLists.txt.orig 2020-07-18 10:43:34 UTC
++++ muse/waveedit/CMakeLists.txt
+@@ -56,6 +56,8 @@ add_library ( waveedit ${MODULES_BUILD}
+ ${waveedit_mocs}
+ )
+
++add_dependencies(waveedit components)
++
+ ##
+ ## Append to the list of translations
+ ##