git: b9710a8d1617 - main - graphics/shotwell: unbreak after 843c31724a
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Thu, 24 Mar 2022 10:41:00 UTC
The branch main has been updated by cmt:
URL: https://cgit.FreeBSD.org/ports/commit/?id=b9710a8d1617715abaf72d72a8023d3666d9dca0
commit b9710a8d1617715abaf72d72a8023d3666d9dca0
Author: Christoph Moench-Tegeder <cmt@FreeBSD.org>
AuthorDate: 2022-03-24 10:38:14 +0000
Commit: Christoph Moench-Tegeder <cmt@FreeBSD.org>
CommitDate: 2022-03-24 10:38:14 +0000
graphics/shotwell: unbreak after 843c31724a
vala 0.48.23 misorders variable and constant declarations and puts the
definition of DEFAULT_SCALE after it's (only) use:
src/shotwell.p/dialogs/ExportDialog.c:146:43: error: use of undeclared identifier 'EXPORT_DIALOG_DEFAULT_SCALE'
static gint export_dialog_current_scale = EXPORT_DIALOG_DEFAULT_SCALE;
As a workaround, just insert the constant directly.
---
graphics/shotwell/files/patch-src_dialogs_ExportDialog.vala | 12 ++++++++++++
1 file changed, 12 insertions(+)
diff --git a/graphics/shotwell/files/patch-src_dialogs_ExportDialog.vala b/graphics/shotwell/files/patch-src_dialogs_ExportDialog.vala
new file mode 100644
index 000000000000..8963137ef12d
--- /dev/null
+++ b/graphics/shotwell/files/patch-src_dialogs_ExportDialog.vala
@@ -0,0 +1,12 @@
+--- src/dialogs/ExportDialog.vala.orig 2022-03-24 11:17:17.231343000 +0100
++++ src/dialogs/ExportDialog.vala 2022-03-24 11:34:07.028552000 +0100
+@@ -23,7 +23,8 @@
+
+ private static ScaleConstraint current_constraint = ScaleConstraint.ORIGINAL;
+ private static ExportFormatParameters current_parameters = ExportFormatParameters.current();
+- private static int current_scale = DEFAULT_SCALE;
++ // DEFAULT_SCALE, but vala misorders the definitions
++ private static int current_scale = 1200;
+
+ private Gtk.Grid table = new Gtk.Grid();
+ private Gtk.ComboBoxText quality_combo;