diff --git a/graphics/elementary-photos/Makefile b/graphics/elementary-photos/Makefile index 89b3b4c7e08f..e2b01659545b 100644 --- a/graphics/elementary-photos/Makefile +++ b/graphics/elementary-photos/Makefile @@ -1,51 +1,39 @@ PORTNAME= elementary-photos -DISTVERSION= 2.7.1 -PORTREVISION= 3 +DISTVERSION= 2.7.4 CATEGORIES= graphics MAINTAINER= miguel@gocobachi.dev COMMENT= Photo viewer and organizer designed for elementary OS LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/COPYING BUILD_DEPENDS= valac:lang/vala -LIB_DEPENDS= libaccounts-glib.so:net-im/libaccounts-glib \ - libexif.so:graphics/libexif \ +LIB_DEPENDS= libexif.so:graphics/libexif \ libgee-0.8.so:devel/libgee \ libgeocode-glib.so:net/geocode-glib \ libgexiv2.so:graphics/gexiv2 \ - libglib-2.0.so:devel/glib20 \ libgphoto2.so:graphics/libgphoto2 \ libgphoto2_port.so:graphics/libgphoto2 \ libgranite.so:x11-toolkits/granite \ - libgstbase-1.0.so:multimedia/gstreamer1 \ libgudev-1.0.so:devel/libgudev \ libjson-glib-1.0.so:devel/json-glib \ libhandy-1.so:x11-toolkits/libhandy \ libraw.so:graphics/libraw \ librest-0.7.so:devel/librest \ libsoup-2.4.so:devel/libsoup \ libwebkit2gtk-4.0.so:www/webkit2-gtk3 \ - libwebp.so:graphics/webp \ - libxml2.so:textproc/libxml2 + libwebp.so:graphics/webp USES= compiler:c11 desktop-file-utils gettext gnome gstreamer meson \ - ninja pkgconfig sqlite xorg + pkgconfig sqlite:3 xorg USE_GITHUB= yes GH_ACCOUNT= elementary GH_PROJECT= photos -USE_GNOME= cairo gdkpixbuf2 gtk30 intltool +USE_GNOME= cairo glib20 gdkpixbuf2 gtk30 libxml2 GLIB_SCHEMAS= io.elementary.photos-extras.gschema.xml \ io.elementary.photos.gschema.xml USE_LDCONFIG= yes USE_XORG= x11 -MESON_BUILD_DIR= build - -_ICONSDIR= ${STAGEDIR}${PREFIX}/share/icons/elementary-photos - -post-configure: - @${MKDIR} ${_ICONSDIR} - ${INSTALL_DATA} ${WRKSRC}/data/icons/*.svg ${_ICONSDIR}/ .include diff --git a/graphics/elementary-photos/distinfo b/graphics/elementary-photos/distinfo index 74e4ebee3447..ab6e721f5bad 100644 --- a/graphics/elementary-photos/distinfo +++ b/graphics/elementary-photos/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1628900913 -SHA256 (elementary-photos-2.7.1_GH0.tar.gz) = a42f7d61b2cbaa21ab2a03d07dcd59304c90664d34421e38db383f37f87c6316 -SIZE (elementary-photos-2.7.1_GH0.tar.gz) = 6717005 +TIMESTAMP = 1650719197 +SHA256 (elementary-photos-2.7.4_GH0.tar.gz) = 3227f498e483b150f0a1407f4cf244d69f1c7453fc9bcba164fe3ab944283315 +SIZE (elementary-photos-2.7.4_GH0.tar.gz) = 6755365 diff --git a/graphics/elementary-photos/files/patch-meson.build b/graphics/elementary-photos/files/patch-meson.build new file mode 100644 index 000000000000..926673d84958 --- /dev/null +++ b/graphics/elementary-photos/files/patch-meson.build @@ -0,0 +1,10 @@ +--- meson.build.orig 2022-02-01 18:38:16 UTC ++++ meson.build +@@ -6,7 +6,6 @@ project( + ) + + add_project_arguments([ +- '-Wno-discarded-qualifiers', + '-Wno-incompatible-pointer-types', + '-Wno-unused', + '-Wl,--enable-new-dtags', diff --git a/graphics/elementary-photos/files/patch-src_main.vala b/graphics/elementary-photos/files/patch-src_main.vala new file mode 100644 index 000000000000..d8d231836066 --- /dev/null +++ b/graphics/elementary-photos/files/patch-src_main.vala @@ -0,0 +1,11 @@ +--- src/main.vala.orig 2022-02-01 18:38:16 UTC ++++ src/main.vala +@@ -273,7 +273,7 @@ namespace CommandlineOptions { + bool show_version = false; + bool debug_enabled = false; + +- public const OptionEntry[] APP_OPTIONS = { ++ const OptionEntry[] APP_OPTIONS = { + { "datadir", 'd', 0, OptionArg.FILENAME, out data_dir, N_("Path to Photos' private data"), N_("DIRECTORY")}, + { "no-runtime-monitoring", 0, 0, OptionArg.NONE, out no_runtime_monitoring, N_("Do not monitor library directory at runtime for changes"), null}, + { "no-startup-progress", 0, 0, OptionArg.NONE, out no_startup_progress, N_("Don't display startup progress meter"), null}, diff --git a/graphics/elementary-photos/files/patch-vapi_config.vapi b/graphics/elementary-photos/files/patch-vapi_config.vapi new file mode 100644 index 000000000000..9d9f0ec681b0 --- /dev/null +++ b/graphics/elementary-photos/files/patch-vapi_config.vapi @@ -0,0 +1,26 @@ +--- vapi/config.vapi.orig 2022-02-01 18:38:16 UTC ++++ vapi/config.vapi +@@ -5,16 +5,16 @@ + */ + + [CCode (cheader_filename="config.h")] +-extern const string _PREFIX; ++public const string _PREFIX; + [CCode (cheader_filename="config.h")] +-extern const string _VERSION; ++public const string _VERSION; + [CCode (cheader_filename="config.h")] +-extern const string GETTEXT_PACKAGE; ++public const string GETTEXT_PACKAGE; + [CCode (cheader_filename="config.h")] +-extern const string LOCALEDIR; ++public const string LOCALEDIR; + [CCode (cheader_filename="config.h")] +-extern const string _LIB; ++public const string _LIB; + [CCode (cheader_filename="config.h")] +-extern const string _LIBEXECDIR; ++public const string _LIBEXECDIR; + [CCode (cheader_filename="config.h")] +-extern const string PROJECT_NAME; ++public const string PROJECT_NAME; diff --git a/graphics/elementary-photos/pkg-plist b/graphics/elementary-photos/pkg-plist index 49254c4f1035..de939d95b297 100644 --- a/graphics/elementary-photos/pkg-plist +++ b/graphics/elementary-photos/pkg-plist @@ -1,240 +1,220 @@ bin/io.elementary.photos lib/io.elementary.photos/plugins/libpantheon-photos-publishing-extras.so lib/io.elementary.photos/plugins/libpantheon-photos-publishing.so lib/io.elementary.photos/plugins/libpantheon-photos-transitions.so libexec/io.elementary.photos/video-thumbnailer share/applications/io.elementary.photos-viewer.desktop share/applications/io.elementary.photos.desktop -share/icons/elementary-photos/128.svg -share/icons/elementary-photos/16.svg -share/icons/elementary-photos/24.svg -share/icons/elementary-photos/32.svg -share/icons/elementary-photos/48.svg -share/icons/elementary-photos/64.svg -share/icons/elementary-photos/aperture-symbolic.svg -share/icons/elementary-photos/drag-nub.svg -share/icons/elementary-photos/edit-flag.svg -share/icons/elementary-photos/exposure-bias-symbolic.svg -share/icons/elementary-photos/exposure-symbolic.svg -share/icons/elementary-photos/flash-symbolic.svg -share/icons/elementary-photos/focal-length-symbolic.svg -share/icons/elementary-photos/image-adjust.svg -share/icons/elementary-photos/image-auto-adjust.svg -share/icons/elementary-photos/image-crop.svg -share/icons/elementary-photos/image-red-eye.svg -share/icons/elementary-photos/iso-symbolic.svg -share/icons/elementary-photos/noninterpretable-video.svg -share/icons/elementary-photos/object-straighten.svg share/icons/hicolor/128x128/apps/io.elementary.photos.svg share/icons/hicolor/128x128@2/apps/io.elementary.photos.svg share/icons/hicolor/16x16/apps/io.elementary.photos.svg share/icons/hicolor/16x16@2/apps/io.elementary.photos.svg share/icons/hicolor/24x24/apps/io.elementary.photos.svg share/icons/hicolor/24x24@2/apps/io.elementary.photos.svg share/icons/hicolor/32x32/apps/io.elementary.photos.svg share/icons/hicolor/32x32@2/apps/io.elementary.photos.svg share/icons/hicolor/48x48/apps/io.elementary.photos.svg share/icons/hicolor/48x48@2/apps/io.elementary.photos.svg share/icons/hicolor/64x64/apps/io.elementary.photos.svg share/icons/hicolor/64x64@2/apps/io.elementary.photos.svg share/locale/aa/LC_MESSAGES/io.elementary.photos.mo share/locale/ab/LC_MESSAGES/io.elementary.photos.mo share/locale/ae/LC_MESSAGES/io.elementary.photos.mo share/locale/af/LC_MESSAGES/io.elementary.photos.mo share/locale/ak/LC_MESSAGES/io.elementary.photos.mo share/locale/am/LC_MESSAGES/io.elementary.photos.mo share/locale/an/LC_MESSAGES/io.elementary.photos.mo share/locale/ar/LC_MESSAGES/io.elementary.photos.mo share/locale/as/LC_MESSAGES/io.elementary.photos.mo share/locale/ast/LC_MESSAGES/io.elementary.photos.mo share/locale/av/LC_MESSAGES/io.elementary.photos.mo share/locale/ay/LC_MESSAGES/io.elementary.photos.mo share/locale/az/LC_MESSAGES/io.elementary.photos.mo share/locale/ba/LC_MESSAGES/io.elementary.photos.mo share/locale/be/LC_MESSAGES/io.elementary.photos.mo share/locale/bg/LC_MESSAGES/io.elementary.photos.mo share/locale/bh/LC_MESSAGES/io.elementary.photos.mo share/locale/bi/LC_MESSAGES/io.elementary.photos.mo share/locale/bm/LC_MESSAGES/io.elementary.photos.mo share/locale/bn/LC_MESSAGES/io.elementary.photos.mo share/locale/bn_IN/LC_MESSAGES/io.elementary.photos.mo share/locale/bo/LC_MESSAGES/io.elementary.photos.mo share/locale/br/LC_MESSAGES/io.elementary.photos.mo share/locale/bs/LC_MESSAGES/io.elementary.photos.mo share/locale/ca/LC_MESSAGES/io.elementary.photos.mo share/locale/ce/LC_MESSAGES/io.elementary.photos.mo share/locale/ch/LC_MESSAGES/io.elementary.photos.mo share/locale/ckb/LC_MESSAGES/io.elementary.photos.mo share/locale/co/LC_MESSAGES/io.elementary.photos.mo share/locale/cr/LC_MESSAGES/io.elementary.photos.mo share/locale/cs/LC_MESSAGES/io.elementary.photos.mo share/locale/cu/LC_MESSAGES/io.elementary.photos.mo share/locale/cv/LC_MESSAGES/io.elementary.photos.mo share/locale/cy/LC_MESSAGES/io.elementary.photos.mo share/locale/da/LC_MESSAGES/io.elementary.photos.mo share/locale/de/LC_MESSAGES/io.elementary.photos.mo share/locale/dv/LC_MESSAGES/io.elementary.photos.mo share/locale/dz/LC_MESSAGES/io.elementary.photos.mo share/locale/ee/LC_MESSAGES/io.elementary.photos.mo share/locale/el/LC_MESSAGES/io.elementary.photos.mo share/locale/en_AU/LC_MESSAGES/io.elementary.photos.mo share/locale/en_CA/LC_MESSAGES/io.elementary.photos.mo share/locale/en_GB/LC_MESSAGES/io.elementary.photos.mo share/locale/eo/LC_MESSAGES/io.elementary.photos.mo share/locale/es/LC_MESSAGES/io.elementary.photos.mo share/locale/et/LC_MESSAGES/io.elementary.photos.mo share/locale/eu/LC_MESSAGES/io.elementary.photos.mo share/locale/fa/LC_MESSAGES/io.elementary.photos.mo share/locale/ff/LC_MESSAGES/io.elementary.photos.mo share/locale/fi/LC_MESSAGES/io.elementary.photos.mo share/locale/fj/LC_MESSAGES/io.elementary.photos.mo share/locale/fo/LC_MESSAGES/io.elementary.photos.mo share/locale/fr/LC_MESSAGES/io.elementary.photos.mo share/locale/fr_CA/LC_MESSAGES/io.elementary.photos.mo share/locale/fy/LC_MESSAGES/io.elementary.photos.mo share/locale/ga/LC_MESSAGES/io.elementary.photos.mo share/locale/gd/LC_MESSAGES/io.elementary.photos.mo share/locale/gl/LC_MESSAGES/io.elementary.photos.mo share/locale/gn/LC_MESSAGES/io.elementary.photos.mo share/locale/gu/LC_MESSAGES/io.elementary.photos.mo share/locale/gv/LC_MESSAGES/io.elementary.photos.mo share/locale/ha/LC_MESSAGES/io.elementary.photos.mo share/locale/he/LC_MESSAGES/io.elementary.photos.mo share/locale/hi/LC_MESSAGES/io.elementary.photos.mo share/locale/ho/LC_MESSAGES/io.elementary.photos.mo share/locale/hr/LC_MESSAGES/io.elementary.photos.mo share/locale/ht/LC_MESSAGES/io.elementary.photos.mo share/locale/hu/LC_MESSAGES/io.elementary.photos.mo share/locale/hy/LC_MESSAGES/io.elementary.photos.mo share/locale/hz/LC_MESSAGES/io.elementary.photos.mo share/locale/ia/LC_MESSAGES/io.elementary.photos.mo share/locale/id/LC_MESSAGES/io.elementary.photos.mo share/locale/ie/LC_MESSAGES/io.elementary.photos.mo share/locale/ig/LC_MESSAGES/io.elementary.photos.mo share/locale/ii/LC_MESSAGES/io.elementary.photos.mo share/locale/ik/LC_MESSAGES/io.elementary.photos.mo share/locale/io/LC_MESSAGES/io.elementary.photos.mo share/locale/is/LC_MESSAGES/io.elementary.photos.mo share/locale/it/LC_MESSAGES/io.elementary.photos.mo share/locale/iu/LC_MESSAGES/io.elementary.photos.mo share/locale/ja/LC_MESSAGES/io.elementary.photos.mo share/locale/jbo/LC_MESSAGES/io.elementary.photos.mo share/locale/jv/LC_MESSAGES/io.elementary.photos.mo share/locale/ka/LC_MESSAGES/io.elementary.photos.mo share/locale/kg/LC_MESSAGES/io.elementary.photos.mo share/locale/ki/LC_MESSAGES/io.elementary.photos.mo share/locale/kj/LC_MESSAGES/io.elementary.photos.mo share/locale/kk/LC_MESSAGES/io.elementary.photos.mo share/locale/kl/LC_MESSAGES/io.elementary.photos.mo share/locale/km/LC_MESSAGES/io.elementary.photos.mo share/locale/kn/LC_MESSAGES/io.elementary.photos.mo share/locale/ko/LC_MESSAGES/io.elementary.photos.mo share/locale/kr/LC_MESSAGES/io.elementary.photos.mo share/locale/ks/LC_MESSAGES/io.elementary.photos.mo share/locale/ku/LC_MESSAGES/io.elementary.photos.mo share/locale/kv/LC_MESSAGES/io.elementary.photos.mo share/locale/kw/LC_MESSAGES/io.elementary.photos.mo share/locale/ky/LC_MESSAGES/io.elementary.photos.mo share/locale/la/LC_MESSAGES/io.elementary.photos.mo share/locale/lb/LC_MESSAGES/io.elementary.photos.mo share/locale/lg/LC_MESSAGES/io.elementary.photos.mo share/locale/li/LC_MESSAGES/io.elementary.photos.mo share/locale/ln/LC_MESSAGES/io.elementary.photos.mo share/locale/lo/LC_MESSAGES/io.elementary.photos.mo share/locale/lt/LC_MESSAGES/io.elementary.photos.mo share/locale/lu/LC_MESSAGES/io.elementary.photos.mo share/locale/lv/LC_MESSAGES/io.elementary.photos.mo share/locale/mg/LC_MESSAGES/io.elementary.photos.mo share/locale/mh/LC_MESSAGES/io.elementary.photos.mo share/locale/mi/LC_MESSAGES/io.elementary.photos.mo share/locale/mk/LC_MESSAGES/io.elementary.photos.mo share/locale/ml/LC_MESSAGES/io.elementary.photos.mo share/locale/mn/LC_MESSAGES/io.elementary.photos.mo share/locale/mo/LC_MESSAGES/io.elementary.photos.mo share/locale/mr/LC_MESSAGES/io.elementary.photos.mo share/locale/ms/LC_MESSAGES/io.elementary.photos.mo share/locale/mt/LC_MESSAGES/io.elementary.photos.mo share/locale/my/LC_MESSAGES/io.elementary.photos.mo share/locale/na/LC_MESSAGES/io.elementary.photos.mo share/locale/nb/LC_MESSAGES/io.elementary.photos.mo share/locale/nd/LC_MESSAGES/io.elementary.photos.mo share/locale/ne/LC_MESSAGES/io.elementary.photos.mo share/locale/ng/LC_MESSAGES/io.elementary.photos.mo share/locale/nl/LC_MESSAGES/io.elementary.photos.mo share/locale/nn/LC_MESSAGES/io.elementary.photos.mo share/locale/no/LC_MESSAGES/io.elementary.photos.mo share/locale/nr/LC_MESSAGES/io.elementary.photos.mo share/locale/nv/LC_MESSAGES/io.elementary.photos.mo share/locale/ny/LC_MESSAGES/io.elementary.photos.mo share/locale/oc/LC_MESSAGES/io.elementary.photos.mo share/locale/oj/LC_MESSAGES/io.elementary.photos.mo share/locale/om/LC_MESSAGES/io.elementary.photos.mo share/locale/or/LC_MESSAGES/io.elementary.photos.mo share/locale/os/LC_MESSAGES/io.elementary.photos.mo share/locale/pa/LC_MESSAGES/io.elementary.photos.mo share/locale/pi/LC_MESSAGES/io.elementary.photos.mo share/locale/pl/LC_MESSAGES/io.elementary.photos.mo share/locale/ps/LC_MESSAGES/io.elementary.photos.mo share/locale/pt/LC_MESSAGES/io.elementary.photos.mo share/locale/pt_BR/LC_MESSAGES/io.elementary.photos.mo share/locale/qu/LC_MESSAGES/io.elementary.photos.mo share/locale/rm/LC_MESSAGES/io.elementary.photos.mo share/locale/rn/LC_MESSAGES/io.elementary.photos.mo share/locale/ro/LC_MESSAGES/io.elementary.photos.mo share/locale/ru/LC_MESSAGES/io.elementary.photos.mo share/locale/rue/LC_MESSAGES/io.elementary.photos.mo share/locale/rw/LC_MESSAGES/io.elementary.photos.mo share/locale/sa/LC_MESSAGES/io.elementary.photos.mo share/locale/sc/LC_MESSAGES/io.elementary.photos.mo share/locale/sd/LC_MESSAGES/io.elementary.photos.mo share/locale/se/LC_MESSAGES/io.elementary.photos.mo share/locale/sg/LC_MESSAGES/io.elementary.photos.mo share/locale/si/LC_MESSAGES/io.elementary.photos.mo share/locale/sk/LC_MESSAGES/io.elementary.photos.mo share/locale/sl/LC_MESSAGES/io.elementary.photos.mo share/locale/sm/LC_MESSAGES/io.elementary.photos.mo share/locale/sma/LC_MESSAGES/io.elementary.photos.mo share/locale/sn/LC_MESSAGES/io.elementary.photos.mo share/locale/so/LC_MESSAGES/io.elementary.photos.mo share/locale/sq/LC_MESSAGES/io.elementary.photos.mo share/locale/sr/LC_MESSAGES/io.elementary.photos.mo share/locale/sr@latin/LC_MESSAGES/io.elementary.photos.mo share/locale/ss/LC_MESSAGES/io.elementary.photos.mo share/locale/st/LC_MESSAGES/io.elementary.photos.mo share/locale/su/LC_MESSAGES/io.elementary.photos.mo share/locale/sv/LC_MESSAGES/io.elementary.photos.mo share/locale/sw/LC_MESSAGES/io.elementary.photos.mo share/locale/szl/LC_MESSAGES/io.elementary.photos.mo share/locale/ta/LC_MESSAGES/io.elementary.photos.mo share/locale/te/LC_MESSAGES/io.elementary.photos.mo share/locale/tg/LC_MESSAGES/io.elementary.photos.mo share/locale/th/LC_MESSAGES/io.elementary.photos.mo share/locale/ti/LC_MESSAGES/io.elementary.photos.mo share/locale/tk/LC_MESSAGES/io.elementary.photos.mo share/locale/tl/LC_MESSAGES/io.elementary.photos.mo share/locale/tn/LC_MESSAGES/io.elementary.photos.mo share/locale/to/LC_MESSAGES/io.elementary.photos.mo share/locale/tr/LC_MESSAGES/io.elementary.photos.mo share/locale/ts/LC_MESSAGES/io.elementary.photos.mo share/locale/tt/LC_MESSAGES/io.elementary.photos.mo share/locale/tw/LC_MESSAGES/io.elementary.photos.mo share/locale/ty/LC_MESSAGES/io.elementary.photos.mo share/locale/ug/LC_MESSAGES/io.elementary.photos.mo share/locale/uk/LC_MESSAGES/io.elementary.photos.mo share/locale/ur/LC_MESSAGES/io.elementary.photos.mo share/locale/uz/LC_MESSAGES/io.elementary.photos.mo share/locale/ve/LC_MESSAGES/io.elementary.photos.mo share/locale/vi/LC_MESSAGES/io.elementary.photos.mo share/locale/vo/LC_MESSAGES/io.elementary.photos.mo share/locale/wa/LC_MESSAGES/io.elementary.photos.mo share/locale/wo/LC_MESSAGES/io.elementary.photos.mo share/locale/xh/LC_MESSAGES/io.elementary.photos.mo share/locale/yi/LC_MESSAGES/io.elementary.photos.mo share/locale/yo/LC_MESSAGES/io.elementary.photos.mo share/locale/za/LC_MESSAGES/io.elementary.photos.mo share/locale/zh/LC_MESSAGES/io.elementary.photos.mo share/locale/zh_CN/LC_MESSAGES/io.elementary.photos.mo share/locale/zh_HK/LC_MESSAGES/io.elementary.photos.mo share/locale/zh_TW/LC_MESSAGES/io.elementary.photos.mo share/locale/zu/LC_MESSAGES/io.elementary.photos.mo share/metainfo/io.elementary.photos.appdata.xml