diff --git a/srcpkgs/io.elementary.photos/patches/fix-meson.patch b/srcpkgs/io.elementary.photos/patches/fix-meson.patch deleted file mode 100644 index 820e3b8ef9..0000000000 --- a/srcpkgs/io.elementary.photos/patches/fix-meson.patch +++ /dev/null @@ -1,95 +0,0 @@ -From 27e529fc96da828982563e2e19a6f0cef883a29e Mon Sep 17 00:00:00 2001 -From: Rico Tzschichholz -Date: Wed, 22 Jul 2020 19:35:53 +0200 -Subject: [PATCH] meson: Properly include config.vapi and config.h (#578) - ---- - meson.build | 21 +++++++++++++++++++-- - src/meson.build | 13 ------------- - 2 files changed, 19 insertions(+), 15 deletions(-) - -diff --git meson.build meson.build -index 5edb5314..9bebaca0 100644 ---- a/meson.build -+++ b/meson.build -@@ -11,14 +11,33 @@ add_project_arguments([ - '-Wno-unused', - '-Wl,--enable-new-dtags', - -+ '-include', 'config.h', - '-DGETTEXT_PACKAGE="@0@"'.format(meson.project_name()) - ], - language: 'c', - ) -+add_project_arguments([ -+ '--vapidir', join_paths(meson.current_source_dir(), 'vapi'), -+ '--pkg', 'config', -+ ], -+ language: 'vala', -+) - - libexecdir = join_paths(get_option('prefix'), get_option('libexecdir'), meson.project_name()) - pluginsdir = join_paths(get_option('prefix'), get_option('libdir'), meson.project_name(), 'plugins') - -+conf_data = configuration_data() -+conf_data.set_quoted('PROJECT_NAME', meson.project_name()) -+conf_data.set_quoted('GETTEXT_PACKAGE', meson.project_name()) -+conf_data.set_quoted('_VERSION', meson.project_version()) -+conf_data.set_quoted('_PREFIX', get_option('prefix')) -+conf_data.set_quoted('_LIB', join_paths(get_option('prefix'), get_option('libdir'))) -+conf_data.set_quoted('_LIBEXECDIR', libexecdir) -+config_header = configure_file( -+ output : 'config.h', -+ configuration : conf_data -+) -+ - gnome = import('gnome') - i18n = import('i18n') - -@@ -52,7 +71,6 @@ gstreamer_plugins_base_vapi = meson.get_compiler('vala').find_library('gstreamer - gstreamer_plugins_base_dep = declare_dependency(dependencies: [gstreamer_plugins_base_vapi]) - lconv_dep = meson.get_compiler('vala').find_library('LConv', dirs: join_paths(meson.current_source_dir(), 'vapi')) - linux_dep = meson.get_compiler('vala').find_library('linux') --config_dep = meson.get_compiler('vala').find_library('config', dirs: join_paths(meson.current_source_dir(), 'vapi')) - - vapi_include = include_directories('./vapi') - -@@ -82,7 +100,6 @@ dependencies = [ - webkit2gtk_dep, - lconv_dep, - linux_dep, -- config_dep - ] - - add_project_arguments(['--vapidir', join_paths(meson.current_source_dir(), 'vapi')], language: 'vala') -diff --git src/meson.build src/meson.build -index 45bf4c1b..1215d778 100644 ---- a/src/meson.build -+++ b/src/meson.build -@@ -4,18 +4,6 @@ library_files = files( - 'plugins/TransitionsInterfaces.vala' - ) - --conf_data = configuration_data() --conf_data.set_quoted('PROJECT_NAME', meson.project_name()) --conf_data.set_quoted('GETTEXT_PACKAGE', meson.project_name()) --conf_data.set_quoted('_VERSION', meson.project_version()) --conf_data.set_quoted('_PREFIX', get_option('prefix')) --conf_data.set_quoted('_LIB', join_paths(get_option('prefix'), get_option('libdir'))) --conf_data.set_quoted('_LIBEXECDIR', libexecdir) --config_header = configure_file( -- output : 'config.h', -- configuration : conf_data --) -- - photos_files = files( - 'AppDirs.vala', - 'Application.vala', -@@ -233,7 +221,6 @@ photos_exe = executable( - meson.project_name(), - photos_files, - library_files, -- config_header, - icons_gresource, - global_gresource, - dependencies: dependencies, diff --git a/srcpkgs/io.elementary.photos/template b/srcpkgs/io.elementary.photos/template index 81c1734164..d0f69169be 100644 --- a/srcpkgs/io.elementary.photos/template +++ b/srcpkgs/io.elementary.photos/template @@ -1,22 +1,21 @@ # Template file for 'io.elementary.photos' pkgname=io.elementary.photos -version=2.7.0 -revision=2 +version=2.7.4 +revision=1 wrksrc="photos-${version}" build_style=meson -configure_args="-Dlibunity=false" -hostmakedepends="desktop-file-utils intltool pkg-config vala AppStream +hostmakedepends="desktop-file-utils gettext pkg-config vala AppStream glib-devel python3-scour" makedepends="libaccounts-glib-devel libexif-devel libgee08-devel geocode-glib-devel libgexiv2-devel libglib-devel libgphoto2-devel gst-plugins-base1-devel gstreamer1-devel gtk+3-devel libgudev-devel json-glib-devel libraw-devel rest-devel libsoup-devel sqlite-devel webkit2gtk-devel libwebp-devel libxml2-devel granite-devel libnotify-devel - vte3-devel" + vte3-devel libhandy1-devel" depends="desktop-file-utils gsettings-desktop-schemas" short_desc="Photo viewer and organizer designed for elementary OS" maintainer="Cameron Nemo " license="LGPL-2.1-or-later" homepage="https://github.com/elementary/photos" distfiles="https://github.com/elementary/photos/archive/${version}.tar.gz" -checksum=9f6ad409d053e3239b9ec7fc59429afe9ce89e40878697a73c2c3f215556a074 +checksum=3227f498e483b150f0a1407f4cf244d69f1c7453fc9bcba164fe3ab944283315