From nobody Thu Mar 24 10:41:00 2022 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 3A3F31A3E829; Thu, 24 Mar 2022 10:41:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4KPMFn1CrZz4kZN; Thu, 24 Mar 2022 10:41:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1648118461; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fdXtGYnIaWHI/isFB9NG75HA3lFRdIDn+Jrp/sciqWA=; b=Yjfr9RoMA35WnahSMLqtr4XCq60w7bqNsuTKl4SHpoWvpD87lxSsBFuZytfIEprmQgvXQD 1/fNB4atOA/fBoaQNcoqfcMc3dmfJ6S7gUw40Us4FdcuI1cYqp9xQPrGwI65+DMlTo7Nze ho/ObdSMmjlVTObUMfcdxTDlWsFiRfGnr3Mqz52vE2SnV8apuE3lC/wz7zHKqEy9FgTi+a M+3w1tSpbwTkMuAg+PXZ5KGIXAKdqdqhoYZf2milgcwLE7QelNEU1Ljl/hdZmNE3mWJSUZ oZrN4CwzBgP/Hw1hqy/8YyyUF4aaRyoS2jOH1wFh9Ciui9lYAb/qzKltkFQlaA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 097AB164CE; Thu, 24 Mar 2022 10:41:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 22OAf08G025730; Thu, 24 Mar 2022 10:41:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 22OAf0rs025729; Thu, 24 Mar 2022 10:41:00 GMT (envelope-from git) Date: Thu, 24 Mar 2022 10:41:00 GMT Message-Id: <202203241041.22OAf0rs025729@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Christoph Moench-Tegeder Subject: git: b9710a8d1617 - main - graphics/shotwell: unbreak after 843c31724a List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cmt X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b9710a8d1617715abaf72d72a8023d3666d9dca0 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1648118461; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fdXtGYnIaWHI/isFB9NG75HA3lFRdIDn+Jrp/sciqWA=; b=Sc1XI9+4OZkobBZZY0TTm/B125yVWA9EvTBhbcIE078sEiBDHEMrkBkRRjJa4GUNjuSVIf XNp4qgayJkB695KGEdfUZ1LM79WnJnSfHKBPp80a3FtzgrKc1e2iM4/AsyIRYMRKNsBxzN XkApNtuzL7XbS5JSE019OSo2PIGNAxImFy18X6KsJfsTPdo1GZx8gI0yG0sPJl4f9aj+gU 3VP5sTlUb1hni8yjvOl8MgbMAvZG+bVDEjjw3pwWJO7P34LH6xugQ15kWwn+jtLmlIjV9B xVlhZdJ9CdfD8CKKgUNH+hXFwjEIjzn8SlLVRMDQlXV+ZiN5W1UYSX7zt5a5fg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1648118461; a=rsa-sha256; cv=none; b=HW8eojYh2pgn/Vs6nQXalMJrtRQwImGKlegCqIEGt1QHhK+2fYC/XBwuEojb9RS/FdDuAe 6JR3A4BuKO7RQjkTn1uOz8YPPkfwX41uvau+WmTu33L5inyph7Xw8o2smHSM/3r5mNReId PAYCmRKkOekASrrCKf2MiZx6CE+03RR49KNwpLvZxJU5Pik8xsqNd223Ljkz/Z/EiqKzEz WPd3K/CEOitgcitLAn0gu09MgtJRKcqNpUX5/rTiZ8ceVmAbYkBqGZJffDUOzQWVvalcrA 4mayM5f5a7ud4AHKjba0bK/2YQIE9JTjNn9+ilksAja3xxZXlKq64nT/UY0Rbg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by cmt: URL: https://cgit.FreeBSD.org/ports/commit/?id=b9710a8d1617715abaf72d72a8023d3666d9dca0 commit b9710a8d1617715abaf72d72a8023d3666d9dca0 Author: Christoph Moench-Tegeder AuthorDate: 2022-03-24 10:38:14 +0000 Commit: Christoph Moench-Tegeder 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;