From b8279d38481840b7b70e3ee2f76d55ebac91a4dd Mon Sep 17 00:00:00 2001 From: oreo639 <31916379+Oreo639@users.noreply.github.com> Date: Wed, 23 Mar 2022 21:43:48 -0700 Subject: [PATCH] shotwell: fix build with vala 0.56.0 --- .../patches/shotwell-0.54.1-vapi_fixes.patch | 67 +++++++++++++++++++ 1 file changed, 67 insertions(+) create mode 100644 srcpkgs/shotwell/patches/shotwell-0.54.1-vapi_fixes.patch diff --git a/srcpkgs/shotwell/patches/shotwell-0.54.1-vapi_fixes.patch b/srcpkgs/shotwell/patches/shotwell-0.54.1-vapi_fixes.patch new file mode 100644 index 00000000000..f39f988f964 --- /dev/null +++ b/srcpkgs/shotwell/patches/shotwell-0.54.1-vapi_fixes.patch @@ -0,0 +1,67 @@ +From 59ae0ce648982669f24a33db501f3f229508cb6e Mon Sep 17 00:00:00 2001 +From: Rico Tzschichholz +Date: Tue, 30 Nov 2021 15:09:17 +0100 +Subject: [PATCH] Fix accessibility issues with initializer of constants + +--- + src/International.vala | 2 -- + src/Resources.vala | 7 ------- + vapi/version.vapi | 17 ++++++++++++++--- + 3 files changed, 14 insertions(+), 12 deletions(-) + +diff --git a/src/International.vala b/src/International.vala +index 555a91f8..73f07639 100644 +--- a/src/International.vala ++++ b/src/International.vala +@@ -4,8 +4,6 @@ + * See the COPYING file in this distribution. + */ + +-extern const string _LANG_SUPPORT_DIR; +- + public const string TRANSLATABLE = "translatable"; + + namespace InternationalSupport { +diff --git a/src/Resources.vala b/src/Resources.vala +index 6d2b8851..86f0eb65 100644 +--- a/src/Resources.vala ++++ b/src/Resources.vala +@@ -4,13 +4,6 @@ + * See the COPYING file in this distribution. + */ + +-// defined by ./configure or Makefile and included by gcc -D +-extern const string _PREFIX; +-extern const string _VERSION; +-extern const string GETTEXT_PACKAGE; +-extern const string _LIB; +-extern const string _LIBEXECDIR; +- + namespace Resources { + public const string APP_TITLE = "Shotwell"; + public const string APP_LIBRARY_ROLE = _("Photo Manager"); +diff --git a/vapi/version.vapi b/vapi/version.vapi +index 06974c84..e191f2f7 100644 +--- a/vapi/version.vapi ++++ b/vapi/version.vapi +@@ -1,3 +1,14 @@ +-[CCode (cheader_filename="version.h")] +-extern const string? _GIT_VERSION; +- ++[CCode (cheader_filename = "version.h")] ++public const string? _GIT_VERSION; ++[CCode (cheader_filename = "config.h")] ++public const string _PREFIX; ++[CCode (cheader_filename = "config.h")] ++public const string _VERSION; ++[CCode (cheader_filename = "config.h")] ++public const string GETTEXT_PACKAGE; ++[CCode (cheader_filename = "config.h")] ++public const string _LIB; ++[CCode (cheader_filename = "config.h")] ++public const string _LIBEXECDIR; ++[CCode (cheader_filename = "config.h")] ++public const string _LANG_SUPPORT_DIR; +-- +GitLab +