zepto-mirrors/meta-musicians
1
0
Fork 0
mirror of https://github.com/schnitzeltony/meta-musicians.git synced 2026-01-29 17:18:41 +01:00
Code Issues Packages Projects Releases Wiki Activity

gigedit: upgrade 1.1.0 -> 1.1.1

Browse Source 
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
This commit is contained in:
Andreas Müller
2019-09-09 02:01:30 +02:00
parent 594e919280
commit 799f5da6a2
3 changed files with 11 additions and 303 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
recipes-musicians/linuxsampler/gigedit/0001-remove-broken-HAS_PANGOMM_CPP11_ENUMS-ifdeffery.patch
View File

@@ -10,19 +10,20 @@ Upstream-Status: pending
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
src/gigedit/compat.h | 17 -----------------
1 file changed, 17 deletions(-)
src/gigedit/compat.h | 18 ------------------
1 file changed, 18 deletions(-)
diff --git a/src/gigedit/compat.h b/src/gigedit/compat.h
index 5d34a49..5886bbe 100644
index e03b854..e62c27d 100644
--- a/src/gigedit/compat.h
+++ b/src/gigedit/compat.h
@@ -50,14 +50,6 @@
@@ -50,15 +50,6 @@
# include <gtkmmconfig.h>
#endif
-#ifndef HAS_PANGOMM_CPP11_ENUMS // pangomm > 2.40 : <- just a "guess"
-# if PANGOMM_MAJOR_VERSION > 2 || (PANGOMM_MAJOR_VERSION == 2 && PANGOMM_MINOR_VERSION > 40)
-#ifndef HAS_PANGOMM_CPP11_ENUMS
- // new enums introduced in unstable pangomm 2.41.3, but not in stable 2.42
-# if PANGOMM_MAJOR_VERSION > 2 || (PANGOMM_MAJOR_VERSION == 2 && ((PANGOMM_MINOR_VERSION == 41 && PANGOMM_MICRO_VERSION >= 3) || PANGOMM_MINOR_VERSION > 42))
-# define HAS_PANGOMM_CPP11_ENUMS 1
-# else
-# define HAS_PANGOMM_CPP11_ENUMS 0
@@ -32,7 +33,7 @@ index 5d34a49..5886bbe 100644
// Gtk::UIManager had been replaced by Gtk::Builder in GTKMM 3 and removed in GTKMM 4
// Gtk::ActionGroup had been replaced by Gio::ActionGroup in GTKMM 3 and removed in GTKMM 4
#if !defined(USE_GTKMM_BUILDER) || !defined(USE_GLIB_ACTION) // gtkmm > 3.22 :
@@ -187,15 +179,6 @@ typedef Gtk::ActionGroup ActionGroup;
@@ -188,15 +179,6 @@ typedef Gtk::ActionGroup ActionGroup;
typedef Gtk::Action Action;
#endif // USE_GLIB_ACTION
@@ -49,5 +50,5 @@ index 5d34a49..5886bbe 100644
# include <gdkmm/types.h>
# include <gdkmm/cursor.h>
--
2.20.1
2.21.0

292
recipes-musicians/linuxsampler/gigedit/0002-Fix-build-with-gtkmm-3.24.patch
View File

@@ -1,292 +0,0 @@
From ed3a789f61e547275510082688605193eb4760a1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
Date: Fri, 22 Mar 2019 19:18:44 +0100
Subject: [PATCH] Fix build with gtkmm 3.24
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Seems the author expected 3.22 being the last of 3.x series
Upstream-Status: Pending
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
src/gigedit/CombineInstrumentsDialog.cpp | 2 +-
src/gigedit/MacroEditor.cpp | 2 +-
src/gigedit/ReferencesView.cpp | 2 +-
src/gigedit/compat.h | 26 ++++++++----------------
src/gigedit/dimensionmanager.cpp | 2 +-
src/gigedit/dimregionchooser.cpp | 2 +-
src/gigedit/mainwindow.cpp | 16 +++++++--------
src/gigedit/midirules.cpp | 8 ++++----
src/gigedit/regionchooser.cpp | 4 ++--
src/gigedit/scripteditor.cpp | 2 +-
10 files changed, 28 insertions(+), 38 deletions(-)
diff --git a/src/gigedit/CombineInstrumentsDialog.cpp b/src/gigedit/CombineInstrumentsDialog.cpp
index 9ba85f0..d3ee379 100644
--- a/src/gigedit/CombineInstrumentsDialog.cpp
+++ b/src/gigedit/CombineInstrumentsDialog.cpp
@@ -941,7 +941,7 @@ CombineInstrumentsDialog::CombineInstrumentsDialog(Gtk::Window& parent, gig::Fil
}
m_buttonBox.set_layout(Gtk::BUTTONBOX_END);
-#if GTKMM_MAJOR_VERSION > 3 || (GTKMM_MAJOR_VERSION == 3 && GTKMM_MINOR_VERSION > 22)
+#if GTKMM_MAJOR_VERSION > 3 || (GTKMM_MAJOR_VERSION == 3 && GTKMM_MINOR_VERSION > 24)
m_buttonBox.set_margin(5);
#else
m_buttonBox.set_border_width(5);
diff --git a/src/gigedit/MacroEditor.cpp b/src/gigedit/MacroEditor.cpp
index 75277bf..104a6a1 100644
--- a/src/gigedit/MacroEditor.cpp
+++ b/src/gigedit/MacroEditor.cpp
@@ -232,7 +232,7 @@ void MacroEditor::buildTreeView(const Gtk::TreeModel::Row& parentRow, const Seri
const Serialization::Member& member = parentObject.members()[iMember];
const Serialization::Object& object = m_macro.objectByUID(member.uid());
-#if GTKMM_MAJOR_VERSION > 3 || (GTKMM_MAJOR_VERSION == 3 && GTKMM_MINOR_VERSION > 22)
+#if GTKMM_MAJOR_VERSION > 3 || (GTKMM_MAJOR_VERSION == 3 && GTKMM_MINOR_VERSION > 24)
//HACK: on GTKMM 3.9x append() below requires TreeNodeChildren, parentRow.children() returns TreeNodeConstChildren though, probably going to be fixed before final GTKMM4 release though.
const Gtk::TreeNodeConstChildren& children = parentRow.children();
Gtk::TreeNodeChildren* const pChildren = (Gtk::TreeNodeChildren* const) &children;
diff --git a/src/gigedit/ReferencesView.cpp b/src/gigedit/ReferencesView.cpp
index 2e65bc0..e89fba2 100644
--- a/src/gigedit/ReferencesView.cpp
+++ b/src/gigedit/ReferencesView.cpp
@@ -66,7 +66,7 @@ ReferencesView::ReferencesView(Gtk::Window& parent) :
);
m_buttonBox.set_layout(Gtk::BUTTONBOX_END);
-#if GTKMM_MAJOR_VERSION > 3 || (GTKMM_MAJOR_VERSION == 3 && GTKMM_MINOR_VERSION > 22)
+#if GTKMM_MAJOR_VERSION > 3 || (GTKMM_MAJOR_VERSION == 3 && GTKMM_MINOR_VERSION > 24)
m_buttonBox.set_margin(5);
#else
m_buttonBox.set_border_width(5);
diff --git a/src/gigedit/compat.h b/src/gigedit/compat.h
index 5886bbe..52af58e 100644
--- a/src/gigedit/compat.h
+++ b/src/gigedit/compat.h
@@ -52,8 +52,8 @@
// Gtk::UIManager had been replaced by Gtk::Builder in GTKMM 3 and removed in GTKMM 4
// Gtk::ActionGroup had been replaced by Gio::ActionGroup in GTKMM 3 and removed in GTKMM 4
-#if !defined(USE_GTKMM_BUILDER) || !defined(USE_GLIB_ACTION) // gtkmm > 3.22 :
-# if GTKMM_MAJOR_VERSION > 3 || (GTKMM_MAJOR_VERSION == 3 && GTKMM_MINOR_VERSION > 22)
+#if !defined(USE_GTKMM_BUILDER) || !defined(USE_GLIB_ACTION) // gtkmm > 3.24 :
+# if GTKMM_MAJOR_VERSION > 3 || (GTKMM_MAJOR_VERSION == 3 && GTKMM_MINOR_VERSION > 24)
# define USE_GTKMM_BUILDER 1
# define USE_GLIB_ACTION 1
# else
@@ -70,8 +70,8 @@
# endif
#endif
-#ifndef HAS_GTKMM_CPP11_ENUMS // gtkmm > 3.22
-# if GTKMM_MAJOR_VERSION > 3 || (GTKMM_MAJOR_VERSION == 3 && GTKMM_MINOR_VERSION > 22)
+#ifndef HAS_GTKMM_CPP11_ENUMS // gtkmm > 3.24
+# if GTKMM_MAJOR_VERSION > 3 || (GTKMM_MAJOR_VERSION == 3 && GTKMM_MINOR_VERSION > 24)
# define HAS_GTKMM_CPP11_ENUMS 1
# else
# define HAS_GTKMM_CPP11_ENUMS 0
@@ -79,8 +79,8 @@
#endif
// alignment.h had been removed in GTKMM 4
-#ifndef HAS_GTKMM_ALIGNMENT // gtkmm > 3.22 :
-# if GTKMM_MAJOR_VERSION > 3 || (GTKMM_MAJOR_VERSION == 3 && GTKMM_MINOR_VERSION > 22)
+#ifndef HAS_GTKMM_ALIGNMENT // gtkmm > 3.24 :
+# if GTKMM_MAJOR_VERSION > 3 || (GTKMM_MAJOR_VERSION == 3 && GTKMM_MINOR_VERSION > 24)
# define HAS_GTKMM_ALIGNMENT 0
# else
# define HAS_GTKMM_ALIGNMENT 1
@@ -90,8 +90,8 @@
// Gtk::Table had been replaced by Gtk::Grid in GTKMM 3 and removed in GTKMM 4
// stock.h had been removed in GTKMM 4
// Gtk::VBox, Gtk::HBox and Gtk::HButtonBox had been replaced by Gtk::Box in GTKMM 3 and removed in GTKMM 4
-#if !defined(USE_GTKMM_GRID) || !defined(HAS_GTKMM_STOCK) || !defined(USE_GTKMM_BOX) || !defined(USE_GTKMM_PANED) // gtkmm > 3.22 :
-# if GTKMM_MAJOR_VERSION > 3 || (GTKMM_MAJOR_VERSION == 3 && GTKMM_MINOR_VERSION > 22)
+#if !defined(USE_GTKMM_GRID) || !defined(HAS_GTKMM_STOCK) || !defined(USE_GTKMM_BOX) || !defined(USE_GTKMM_PANED) // gtkmm > 3.24 :
+# if GTKMM_MAJOR_VERSION > 3 || (GTKMM_MAJOR_VERSION == 3 && GTKMM_MINOR_VERSION > 24)
# define USE_GTKMM_GRID 1
# define HAS_GTKMM_STOCK 0
# define USE_GTKMM_BOX 1
diff --git a/src/gigedit/dimensionmanager.cpp b/src/gigedit/dimensionmanager.cpp
index 5bc0617..42138a2 100644
--- a/src/gigedit/dimensionmanager.cpp
+++ b/src/gigedit/dimensionmanager.cpp
@@ -278,7 +278,7 @@ DimensionManager::DimensionManager() :
scrolledWindow.show();
vbox.pack_start(buttonBox, Gtk::PACK_SHRINK);
buttonBox.set_layout(Gtk::BUTTONBOX_END);
-#if GTKMM_MAJOR_VERSION > 3 || (GTKMM_MAJOR_VERSION == 3 && GTKMM_MINOR_VERSION > 22)
+#if GTKMM_MAJOR_VERSION > 3 || (GTKMM_MAJOR_VERSION == 3 && GTKMM_MINOR_VERSION > 24)
buttonBox.set_margin(5);
#else
buttonBox.set_border_width(5);
diff --git a/src/gigedit/dimregionchooser.cpp b/src/gigedit/dimregionchooser.cpp
index 978c88d..d39a6e9 100644
--- a/src/gigedit/dimregionchooser.cpp
+++ b/src/gigedit/dimregionchooser.cpp
@@ -288,7 +288,7 @@ DimRegionChooser::DimRegionChooser(Gtk::Window& window) :
#endif // USE_GTKMM_BUILDER
-#if GTKMM_MAJOR_VERSION > 3 || (GTKMM_MAJOR_VERSION == 3 && GTKMM_MINOR_VERSION > 22)
+#if GTKMM_MAJOR_VERSION > 3 || (GTKMM_MAJOR_VERSION == 3 && GTKMM_MINOR_VERSION > 24)
# warning GTKMM4 event registration code missing for dimregionchooser!
//add_events(Gdk::EventMask::BUTTON_PRESS_MASK);
#else
diff --git a/src/gigedit/mainwindow.cpp b/src/gigedit/mainwindow.cpp
index c66b823..dc559d4 100644
--- a/src/gigedit/mainwindow.cpp
+++ b/src/gigedit/mainwindow.cpp
@@ -2704,7 +2704,7 @@ PropDialog::PropDialog()
#endif
add(vbox);
-#if GTKMM_MAJOR_VERSION > 3 || (GTKMM_MAJOR_VERSION == 3 && GTKMM_MINOR_VERSION > 22)
+#if GTKMM_MAJOR_VERSION > 3 || (GTKMM_MAJOR_VERSION == 3 && GTKMM_MINOR_VERSION > 24)
table.set_margin(5);
#else
table.set_border_width(5);
@@ -2712,7 +2712,7 @@ PropDialog::PropDialog()
vbox.add(table);
vbox.pack_start(buttonBox, Gtk::PACK_SHRINK);
buttonBox.set_layout(Gtk::BUTTONBOX_END);
-#if GTKMM_MAJOR_VERSION > 3 || (GTKMM_MAJOR_VERSION == 3 && GTKMM_MINOR_VERSION > 22)
+#if GTKMM_MAJOR_VERSION > 3 || (GTKMM_MAJOR_VERSION == 3 && GTKMM_MINOR_VERSION > 24)
buttonBox.set_margin(5);
#else
buttonBox.set_border_width(5);
@@ -2863,7 +2863,7 @@ InstrumentProps::InstrumentProps() :
table.add(eDimensionKeyRangeHigh);
add(vbox);
-#if GTKMM_MAJOR_VERSION > 3 || (GTKMM_MAJOR_VERSION == 3 && GTKMM_MINOR_VERSION > 22)
+#if GTKMM_MAJOR_VERSION > 3 || (GTKMM_MAJOR_VERSION == 3 && GTKMM_MINOR_VERSION > 24)
table.set_margin(5);
#else
table.set_border_width(5);
@@ -2872,7 +2872,7 @@ InstrumentProps::InstrumentProps() :
table.show();
vbox.pack_start(buttonBox, Gtk::PACK_SHRINK);
buttonBox.set_layout(Gtk::BUTTONBOX_END);
-#if GTKMM_MAJOR_VERSION > 3 || (GTKMM_MAJOR_VERSION == 3 && GTKMM_MINOR_VERSION > 22)
+#if GTKMM_MAJOR_VERSION > 3 || (GTKMM_MAJOR_VERSION == 3 && GTKMM_MINOR_VERSION > 24)
buttonBox.set_margin(5);
#else
buttonBox.set_border_width(5);
@@ -3325,7 +3325,7 @@ void MainWindow::select_instrument(gig::Instrument* instrument) {
show_intruments_tab();
m_TreeView.get_selection()->unselect_all();
-#if GTKMM_MAJOR_VERSION > 3 || (GTKMM_MAJOR_VERSION == 3 && GTKMM_MINOR_VERSION > 22)
+#if GTKMM_MAJOR_VERSION > 3 || (GTKMM_MAJOR_VERSION == 3 && GTKMM_MINOR_VERSION > 24)
auto iterSel = model->children()[i].get_iter();
m_TreeView.get_selection()->select(iterSel);
#else
@@ -3355,7 +3355,7 @@ bool MainWindow::select_dimension_region(gig::DimensionRegion* dimRgn) {
// select and show the respective instrument in the list view
show_intruments_tab();
m_TreeView.get_selection()->unselect_all();
-#if GTKMM_MAJOR_VERSION > 3 || (GTKMM_MAJOR_VERSION == 3 && GTKMM_MINOR_VERSION > 22)
+#if GTKMM_MAJOR_VERSION > 3 || (GTKMM_MAJOR_VERSION == 3 && GTKMM_MINOR_VERSION > 24)
auto iterSel = model->children()[i].get_iter();
m_TreeView.get_selection()->select(iterSel);
#else
@@ -3391,7 +3391,7 @@ void MainWindow::select_sample(gig::Sample* sample) {
if (rowSample[m_SamplesModel.m_col_sample] == sample) {
show_samples_tab();
m_TreeViewSamples.get_selection()->unselect_all();
-#if GTKMM_MAJOR_VERSION > 3 || (GTKMM_MAJOR_VERSION == 3 && GTKMM_MINOR_VERSION > 22)
+#if GTKMM_MAJOR_VERSION > 3 || (GTKMM_MAJOR_VERSION == 3 && GTKMM_MINOR_VERSION > 24)
auto iterSel = rowGroup.children()[s].get_iter();
m_TreeViewSamples.get_selection()->select(iterSel);
#else
@@ -4650,7 +4650,7 @@ bool MainWindow::instrument_row_visible(const Gtk::TreeModel::const_iterator& it
trim(pattern);
if (pattern.empty()) return true;
-#if GTKMM_MAJOR_VERSION > 3 || (GTKMM_MAJOR_VERSION == 3 && GTKMM_MINOR_VERSION > 22)
+#if GTKMM_MAJOR_VERSION > 3 || (GTKMM_MAJOR_VERSION == 3 && GTKMM_MINOR_VERSION > 24)
//HACK: on GTKMM4 development branch const_iterator cannot be easily converted to iterator, probably going to be fixed before final GTKMM4 release though.
Gtk::TreeModel::Row row = **(Gtk::TreeModel::iterator*)(&iter);
#else
diff --git a/src/gigedit/midirules.cpp b/src/gigedit/midirules.cpp
index 0f1b041..aee093e 100644
--- a/src/gigedit/midirules.cpp
+++ b/src/gigedit/midirules.cpp
@@ -40,7 +40,7 @@ MidiRules::MidiRules() :
}
set_title(_("Midi Rules"));
-#if GTKMM_MAJOR_VERSION > 3 || (GTKMM_MAJOR_VERSION == 3 && GTKMM_MINOR_VERSION > 22)
+#if GTKMM_MAJOR_VERSION > 3 || (GTKMM_MAJOR_VERSION == 3 && GTKMM_MINOR_VERSION > 24)
set_margin(6);
#else
set_border_width(6);
@@ -48,7 +48,7 @@ MidiRules::MidiRules() :
add(vbox);
-#if GTKMM_MAJOR_VERSION > 3 || (GTKMM_MAJOR_VERSION == 3 && GTKMM_MINOR_VERSION > 22)
+#if GTKMM_MAJOR_VERSION > 3 || (GTKMM_MAJOR_VERSION == 3 && GTKMM_MINOR_VERSION > 24)
hbox.set_margin(6);
#else
hbox.set_border_width(6);
@@ -69,14 +69,14 @@ MidiRules::MidiRules() :
sigc::mem_fun(*this, &MidiRules::combo_changed));
vbox.pack_start(hbox, Gtk::PACK_SHRINK);
-#if GTKMM_MAJOR_VERSION > 3 || (GTKMM_MAJOR_VERSION == 3 && GTKMM_MINOR_VERSION > 22)
+#if GTKMM_MAJOR_VERSION > 3 || (GTKMM_MAJOR_VERSION == 3 && GTKMM_MINOR_VERSION > 24)
box.set_margin(6);
#else
box.set_border_width(6);
#endif
vbox.pack_start(box);
-#if GTKMM_MAJOR_VERSION > 3 || (GTKMM_MAJOR_VERSION == 3 && GTKMM_MINOR_VERSION > 22)
+#if GTKMM_MAJOR_VERSION > 3 || (GTKMM_MAJOR_VERSION == 3 && GTKMM_MINOR_VERSION > 24)
button_box.set_margin(6);
#else
button_box.set_border_width(6);
diff --git a/src/gigedit/regionchooser.cpp b/src/gigedit/regionchooser.cpp
index f1136eb..3e0f16a 100644
--- a/src/gigedit/regionchooser.cpp
+++ b/src/gigedit/regionchooser.cpp
@@ -269,7 +269,7 @@ RegionChooser::RegionChooser() :
#endif // USE_GTKMM_BUILDER
-#if GTKMM_MAJOR_VERSION > 3 || (GTKMM_MAJOR_VERSION == 3 && GTKMM_MINOR_VERSION > 22)
+#if GTKMM_MAJOR_VERSION > 3 || (GTKMM_MAJOR_VERSION == 3 && GTKMM_MINOR_VERSION > 24)
# warning GTKMM4 event registration code missing for regionchooser!
//add_events(Gdk::EventMask::BUTTON_PRESS_MASK);
#else
@@ -354,7 +354,7 @@ bool RegionChooser::on_draw(const Cairo::RefPtr<Cairo::Context>& cr) {
#if (GTKMM_MAJOR_VERSION == 2 && GTKMM_MINOR_VERSION < 90) || GTKMM_MAJOR_VERSION < 2
const Gdk::Color bg = get_style()->get_bg(Gtk::STATE_NORMAL);
#else
-#if GTKMM_MAJOR_VERSION > 3 || (GTKMM_MAJOR_VERSION == 3 && GTKMM_MINOR_VERSION > 22)
+#if GTKMM_MAJOR_VERSION > 3 || (GTKMM_MAJOR_VERSION == 3 && GTKMM_MINOR_VERSION > 24)
GdkRGBA gdkBgRGBA;
gtk_style_context_get_background_color(get_style_context()->gobj(), &gdkBgRGBA);
const Gdk::RGBA bg = Glib::wrap(&gdkBgRGBA, true);
diff --git a/src/gigedit/scripteditor.cpp b/src/gigedit/scripteditor.cpp
index 66268f3..11401d8 100644
--- a/src/gigedit/scripteditor.cpp
+++ b/src/gigedit/scripteditor.cpp
@@ -749,7 +749,7 @@ bool ScriptEditor::on_motion_notify_event(GdkEventMotion* e) {
//TODO: event throttling would be a good idea here
updateIssueTooltip(e);
#endif
-#if GTKMM_MAJOR_VERSION < 3 || (GTKMM_MAJOR_VERSION == 3 && GTKMM_MINOR_VERSION <= 22)
+#if GTKMM_MAJOR_VERSION < 3 || (GTKMM_MAJOR_VERSION == 3 && GTKMM_MINOR_VERSION <= 24)
return ManagedWindow::on_motion_notify_event(e);
#else
Gdk::EventMotion em = Glib::wrap(e, true);
--
2.20.1

5
recipes-musicians/linuxsampler/gigedit_1.1.0.bb → recipes-musicians/linuxsampler/gigedit_1.1.1.bb
View File

@@ -18,12 +18,11 @@ inherit autotools pkgconfig gtk-icon-cache
SRC_URI = " \
http://download.linuxsampler.org/packages/${BPN}-${PV}.tar.bz2 \
file://0001-remove-broken-HAS_PANGOMM_CPP11_ENUMS-ifdeffery.patch \
file://0002-Fix-build-with-gtkmm-3.24.patch \
file://gigedit.png \
file://gigedit.desktop \
"
SRC_URI[md5sum] = "1ca041c960d997dd8a58c4072056f165"
SRC_URI[sha256sum] = "d18abe98d8bc6ec0d1ac8b8b185a25d7e2454225fcb030f80e19099c4262f720"
SRC_URI[md5sum] = "2597cfddbceb28f5e764929e6c9755ab"
SRC_URI[sha256sum] = "2b77069302f8721fd614ae4e3ca364f1977731deb166bf5af00d389e9908ab21"
EXTRA_OEMAKE = "LIBTOOLFLAGS='--tag=CXX'"