From 378c3af842b222702b67bacd50e14a6074f631c5 Mon Sep 17 00:00:00 2001 From: oreo639 Date: Sun, 25 Feb 2024 21:15:35 -0800 Subject: [PATCH] io.elementary.photos: disable publishing support Build with soup3 --- .../patches/rm-publishing.patch | 480 ++++++++++++++++++ srcpkgs/io.elementary.photos/template | 8 +- 2 files changed, 484 insertions(+), 4 deletions(-) create mode 100644 srcpkgs/io.elementary.photos/patches/rm-publishing.patch diff --git a/srcpkgs/io.elementary.photos/patches/rm-publishing.patch b/srcpkgs/io.elementary.photos/patches/rm-publishing.patch new file mode 100644 index 00000000000..554f01ca3ba --- /dev/null +++ b/srcpkgs/io.elementary.photos/patches/rm-publishing.patch @@ -0,0 +1,480 @@ +Stripped version of: https://github.com/elementary/photos/pull/746 + +From ac24647adb487836fa6891fbe539a0fd8cd8e2f0 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Corentin=20No=C3=ABl?= +Date: Mon, 21 Aug 2023 14:25:30 +0200 +Subject: [PATCH] Remove the publishing-extras plugins + +--- + data/io.elementary.photos-extras.gschema.xml | 37 - + data/meson.build | 1 - + meson.build | 6 - + plugins/meson.build | 1 - + .../RESTSupport.vala | 1176 ----------------- + .../Resources.vala | 67 - + .../TumblrPublishing.vala | 1162 ---------------- + .../YandexPublishing.vala | 684 ---------- + .../icons/tumblr.png | Bin 1007 -> 0 bytes + ...os.plugins.publishing-extras.gresource.xml | 11 - + .../meson.build | 12 - + .../shotwell-publishing-extras.vala | 53 - + .../ui/tumblr_authentication_pane.ui | 132 -- + .../ui/tumblr_publishing_options_pane.ui | 167 --- + .../ui/yandex_publish_model.ui | 175 --- + 15 files changed, 3684 deletions(-) + delete mode 100644 data/io.elementary.photos-extras.gschema.xml + delete mode 100644 plugins/pantheon-photos-publishing-extras/RESTSupport.vala + delete mode 100644 plugins/pantheon-photos-publishing-extras/Resources.vala + delete mode 100644 plugins/pantheon-photos-publishing-extras/TumblrPublishing.vala + delete mode 100644 plugins/pantheon-photos-publishing-extras/YandexPublishing.vala + delete mode 100644 plugins/pantheon-photos-publishing-extras/icons/tumblr.png + delete mode 100644 plugins/pantheon-photos-publishing-extras/io.elementary.photos.plugins.publishing-extras.gresource.xml + delete mode 100644 plugins/pantheon-photos-publishing-extras/meson.build + delete mode 100644 plugins/pantheon-photos-publishing-extras/shotwell-publishing-extras.vala + delete mode 100644 plugins/pantheon-photos-publishing-extras/ui/tumblr_authentication_pane.ui + delete mode 100644 plugins/pantheon-photos-publishing-extras/ui/tumblr_publishing_options_pane.ui + delete mode 100644 plugins/pantheon-photos-publishing-extras/ui/yandex_publish_model.ui + +diff --git a/data/meson.build b/data/meson.build +index 78a9db048..7ff3eba8f 100644 +--- a/data/meson.build ++++ b/data/meson.build +@@ -25,7 +25,6 @@ foreach i : icon_sizes + endforeach + + install_data( +- meson.project_name() + '-extras.gschema.xml', + meson.project_name() + '.gschema.xml', + install_dir: join_paths(get_option('prefix'), get_option('datadir'), 'glib-2.0', 'schemas') + ) +diff --git a/meson.build b/meson.build +index c71a5c52a..c0296ab34 100644 +--- a/meson.build ++++ b/meson.build +@@ -132,12 +132,6 @@ publishing_gresource = gnome.compile_resources( + source_dir: 'plugins/pantheon-photos-publishing' + ) + +-publishing_extras_gresource = gnome.compile_resources( +- 'gresource_plugin_publishing_extras', +- 'plugins/pantheon-photos-publishing-extras/io.elementary.photos.plugins.publishing-extras.gresource.xml', +- source_dir: 'plugins/pantheon-photos-publishing-extras' +-) +- + subdir('data') + subdir('src') + subdir('thumbnailer') +diff --git a/plugins/meson.build b/plugins/meson.build +index bdd74cf87..a07a7c151 100644 +--- a/plugins/meson.build ++++ b/plugins/meson.build +@@ -1,3 +1,2 @@ + subdir('pantheon-photos-transitions') +-subdir('pantheon-photos-publishing-extras') + subdir('pantheon-photos-publishing') + +From d98b9b17110734a2e71718fdb7b0719e598bf400 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Corentin=20No=C3=ABl?= +Date: Mon, 21 Aug 2023 14:25:50 +0200 +Subject: [PATCH] Remove the publishing plugins + +--- + data/io.elementary.photos.gschema.xml | 196 -- + meson.build | 6 - + plugins/meson.build | 1 - + .../FacebookPublishing.vala | 1692 ---------------- + .../FlickrPublishing.vala | 1375 ------------- + .../PicasaPublishing.vala | 562 ------ + .../PiwigoPublishing.vala | 1734 ----------------- + .../RESTSupport.vala | 1176 ----------- + .../pantheon-photos-publishing/Resources.vala | 43 - + .../YouTubePublishing.vala | 633 ------ + .../icons/facebook.svg | 13 - + .../icons/flickr.svg | 45 - + .../icons/google-photos.svg | 146 -- + .../icons/picasa.png | Bin 1249 -> 0 bytes + .../icons/piwigo.png | Bin 3148 -> 0 bytes + .../icons/youtube.svg | 58 - + ...ry.photos.plugins.publishing.gresource.xml | 20 - + .../pantheon-photos-publishing/meson.build | 15 - + .../shotwell-publishing.vala | 61 - + .../ui/facebook_publishing_options_pane.ui | 243 --- + .../ui/flickr_pin_entry_pane.ui | 101 - + .../ui/flickr_publishing_options_pane.ui | 183 -- + .../ui/picasa_publishing_options_pane.ui | 138 -- + .../ui/piwigo_authentication_pane.ui | 160 -- + .../ui/piwigo_publishing_options_pane.ui | 290 --- + .../ui/youtube_publishing_options_pane.ui | 137 -- + 26 files changed, 9028 deletions(-) + delete mode 100644 plugins/pantheon-photos-publishing/FacebookPublishing.vala + delete mode 100644 plugins/pantheon-photos-publishing/FlickrPublishing.vala + delete mode 100644 plugins/pantheon-photos-publishing/PicasaPublishing.vala + delete mode 100644 plugins/pantheon-photos-publishing/PiwigoPublishing.vala + delete mode 100644 plugins/pantheon-photos-publishing/RESTSupport.vala + delete mode 100644 plugins/pantheon-photos-publishing/Resources.vala + delete mode 100644 plugins/pantheon-photos-publishing/YouTubePublishing.vala + delete mode 100644 plugins/pantheon-photos-publishing/icons/facebook.svg + delete mode 100644 plugins/pantheon-photos-publishing/icons/flickr.svg + delete mode 100644 plugins/pantheon-photos-publishing/icons/google-photos.svg + delete mode 100644 plugins/pantheon-photos-publishing/icons/picasa.png + delete mode 100644 plugins/pantheon-photos-publishing/icons/piwigo.png + delete mode 100644 plugins/pantheon-photos-publishing/icons/youtube.svg + delete mode 100644 plugins/pantheon-photos-publishing/io.elementary.photos.plugins.publishing.gresource.xml + delete mode 100644 plugins/pantheon-photos-publishing/meson.build + delete mode 100644 plugins/pantheon-photos-publishing/shotwell-publishing.vala + delete mode 100644 plugins/pantheon-photos-publishing/ui/facebook_publishing_options_pane.ui + delete mode 100644 plugins/pantheon-photos-publishing/ui/flickr_pin_entry_pane.ui + delete mode 100644 plugins/pantheon-photos-publishing/ui/flickr_publishing_options_pane.ui + delete mode 100644 plugins/pantheon-photos-publishing/ui/picasa_publishing_options_pane.ui + delete mode 100644 plugins/pantheon-photos-publishing/ui/piwigo_authentication_pane.ui + delete mode 100644 plugins/pantheon-photos-publishing/ui/piwigo_publishing_options_pane.ui + delete mode 100644 plugins/pantheon-photos-publishing/ui/youtube_publishing_options_pane.ui + +diff --git a/data/io.elementary.photos.gschema.xml b/data/io.elementary.photos.gschema.xml +index 1b7fd15ab..2da0c593b 100644 +--- a/data/io.elementary.photos.gschema.xml ++++ b/data/io.elementary.photos.gschema.xml +@@ -245,172 +245,6 @@ + default publishing service + A numeric code representing the last service to which photos were published + +- +- +- +- +- +- +- +- +- +- +- "" +- access token +- Facebook OAuth token for the currently logged in session, if any +- +- +- +- "" +- user i.d. +- Facebook user i.d. for the currently logged in user, if any +- +- +- +- "" +- user name +- The name of the currently logged in Facebook user, if any +- +- +- +- 0 +- default size code +- A numeric code representing the default size for photos published to Facebook +- +- +- +- false +- remove sensitive info from uploads +- Whether images being uploaded to Facebook should have their metadata removed first +- +- +- +- +- +- "" +- OAuth Access Phase Token +- The authorization token for the currently logged in Flickr user, if any +- +- +- +- "" +- OAuth Access Phase Token Secret +- The cryptographic secret used to sign requests against the authorization token for the currently logged in Flickr user, if any +- +- +- +- "" +- username +- The user name of the currently logged in Flickr user, if any +- +- +- +- 2 +- default size code +- A numeric code representing the default size for photos published to Flickr +- +- +- +- 1 +- default visibility +- A numeric code representing the default visibility for photos published to Flickr +- +- +- +- false +- remove sensitive info from uploads +- Whether images being uploaded to Flickr should have their metadata removed first +- +- +- +- +- +- "" +- refresh token +- The OAuth token used to refresh the Picasa Web Albums session for the currently logged in user, if any. +- +- +- +- 2 +- default size +- A numeric code representing the default size for photos uploaded to Picasa Web Albums +- +- +- +- false +- remove sensitive info from uploads +- Whether images being uploaded to Picasa should have their metadata removed first +- +- +- +- +- +- "" +- Piwigio URL +- URL of the Piwigo server. +- +- +- +- "" +- username +- Piwigo username, if logged in. +- +- +- +- "" +- password +- Piwigo password, if logged in. +- +- +- +- false +- remember password +- If true, remember the Piwigo password. +- +- +- +- -1 +- last category +- The last selected Piwigo category. +- +- +- +- -1 +- last permission level +- The last chosen Piwigo permission level. +- +- +- +- -1 +- last photo size +- A numeric code representing the last photo size preset used when publishing to Piwigo. +- +- +- +- false +- remove sensitive info from uploads +- Whether images being uploaded to Piwigo should have their metadata removed first +- +- +- +- false +- if title is set and comment unset, use title as comment for uploads to Piwigo +- Whether images being uploaded to Piwigo should have their comment set from the title if title is set and comment unset +- +- +- +- false +- do not upload tags when uploading to Piwigo +- Whether images being uploaded to Piwigo should have their tags removed on upload, such that these tags will not appear on the remote Piwigo server. +- +- +- +- +- +- "" +- refresh token +- The OAuth token used to refresh the YouTube session for the currently logged in user, if any. +- + + + +@@ -488,36 +322,6 @@ + + + +- +- true +- enable facebook publishing plugin +- True if the Facebook publishing plugin is enabled, false otherwise +- +- +- +- true +- enable flickr publishing plugin +- True if the Flickr publishing plugin is enabled, false otherwise +- +- +- +- true +- enable picasa publishing plugin +- True if the Picasa Web Albums publishing plugin is enabled, false otherwise +- +- +- +- true +- enable youtube publishing plugin +- True if the YouTube publishing plugin is enabled, false otherwise +- +- +- +- true +- enable piwigo publishing plugin +- True if the Piwigo publishing plugin is enabled, false otherwise +- +- + + false + enable yandex publishing plugin +diff --git a/meson.build b/meson.build +index c0296ab34..b0c28d92c 100644 +--- a/meson.build ++++ b/meson.build +@@ -126,12 +126,6 @@ transitions_gresource = gnome.compile_resources( + source_dir: 'plugins/pantheon-photos-transitions' + ) + +-publishing_gresource = gnome.compile_resources( +- 'gresource_plugin_publishing', +- 'plugins/pantheon-photos-publishing/io.elementary.photos.plugins.publishing.gresource.xml', +- source_dir: 'plugins/pantheon-photos-publishing' +-) +- + subdir('data') + subdir('src') + subdir('thumbnailer') +diff --git a/plugins/meson.build b/plugins/meson.build +index a07a7c151..a1a7df68f 100644 +--- a/plugins/meson.build ++++ b/plugins/meson.build +@@ -1,2 +1 @@ + subdir('pantheon-photos-transitions') +-subdir('pantheon-photos-publishing') + +From 25ac253620ce4391ce4cdf73694a7b872675d18d Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Corentin=20No=C3=ABl?= +Date: Mon, 21 Aug 2023 14:45:44 +0200 +Subject: [PATCH] Remove the publishing dependencies + +--- + .github/workflows/ci.yml | 2 +- + README.md | 7 ------- + docs/meson.build | 4 ---- + io.elementary.photos.yml | 11 ++--------- + meson.build | 10 ---------- + 5 files changed, 3 insertions(+), 31 deletions(-) + +diff --git a/docs/meson.build b/docs/meson.build +index 10c8b8340..aa70a7aa7 100644 +--- a/docs/meson.build ++++ b/docs/meson.build +@@ -18,15 +18,11 @@ basic_command = [ + '--pkg', 'LConv', + '--pkg', 'granite', + '--pkg', 'gudev-1.0', +- '--pkg', 'json-glib-1.0', + '--pkg', 'libexif', + '--pkg', 'libgphoto2', + '--pkg', 'libraw', + '--pkg', 'libwebp', +- '--pkg', 'libxml-2.0', +- '--pkg', 'rest-0.7', + '--pkg', 'sqlite3', +- '--pkg', 'webkit2gtk-4.0', + '--pkg', 'gstreamer-1.0', + '--pkg', 'gstreamer-base-1.0', + '--pkg', 'gstreamer-pbutils-1.0', +diff --git a/meson.build b/meson.build +index b0c28d92c..9b8377cfe 100644 +--- a/meson.build ++++ b/meson.build +@@ -59,16 +59,11 @@ granite_dep = dependency('granite', version: '>=6.0.0') + gtk_dep = dependency('gtk+-3.0', version: '>=3.6.0') + gudev_dep = dependency('gudev-1.0', version: '>=145') + handy = dependency('libhandy-1') +-json_glib_dep = dependency('json-glib-1.0') + libexif_dep = dependency('libexif', version: '>=0.6.16') + gphoto2_dep = dependency('libgphoto2', version: '>=2.4.2') + libraw_dep = dependency('libraw', version: '>=0.13.2') + libwebp_dep = dependency('libwebp', version: '>=0.4.4') +-libsoup_dep = dependency('libsoup-2.4', version: '>=2.26.0') +-libxml_dep = dependency('libxml-2.0', version: '>=2.6.32') +-rest_dep = dependency('rest-0.7', version: '>=0.7') + sqlite3_dep = dependency('sqlite3', version: '>=3.5.9') +-webkit2gtk_dep = dependency('webkit2gtk-4.0', version: '>=2.0.0') + gstreamer_plugins_base_vapi = meson.get_compiler('vala').find_library('gstreamer-base-1.0') + 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')) +@@ -91,16 +86,11 @@ dependencies = [ + gtk_dep, + gudev_dep, + handy, +- json_glib_dep, + libexif_dep, + gphoto2_dep, + libraw_dep, + libwebp_dep, +- libsoup_dep, +- libxml_dep, +- rest_dep, + sqlite3_dep, +- webkit2gtk_dep, + lconv_dep, + linux_dep, + ] + +From 5c3b63a2f9c80e8e167ff220e15e3a896e0c63ca Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Corentin=20No=C3=ABl?= +Date: Mon, 21 Aug 2023 14:59:29 +0200 +Subject: [PATCH] meson: Allow to use geocode-glib-2.0 + +This is required since the libsoup API bump. +--- + docs/meson.build | 2 +- + meson.build | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/docs/meson.build b/docs/meson.build +index aa70a7aa7..5c5b6a528 100644 +--- a/docs/meson.build ++++ b/docs/meson.build +@@ -7,7 +7,7 @@ basic_command = [ + '--package-name',meson.project_name(), + '--package-version', meson.project_version(), + '--driver', meson.get_compiler('vala').version(), +- '--pkg', 'geocode-glib-1.0', ++ '--pkg', geocode_glib_dep.name(), + '--pkg', 'gexiv2', + '--pkg', 'gtk+-3.0', + '--pkg', 'gee-0.8', +diff --git a/meson.build b/meson.build +index 9b8377cfe..ea72b8881 100644 +--- a/meson.build ++++ b/meson.build +@@ -49,7 +49,7 @@ gexiv2_dep = dependency('gexiv2', version: '>=0.4.90') + if gexiv2_dep.version().version_compare('>= 0.11') + add_global_arguments(['--define=GEXIV2_0_11'], language : 'vala') + endif +-geocode_glib_dep = dependency('geocode-glib-1.0') ++geocode_glib_dep = dependency('geocode-glib-2.0', 'geocode-glib-1.0') + gmodule_dep = dependency('gmodule-2.0', version: '>=2.24.0') + gstreamer_dep = dependency('gstreamer-1.0', version: '>=1.0.0') + gstreamer_base_dep = dependency('gstreamer-base-1.0', version: '>=1.0.0') diff --git a/srcpkgs/io.elementary.photos/template b/srcpkgs/io.elementary.photos/template index 42237ef4575..39fb7066cf4 100644 --- a/srcpkgs/io.elementary.photos/template +++ b/srcpkgs/io.elementary.photos/template @@ -1,15 +1,15 @@ # Template file for 'io.elementary.photos' pkgname=io.elementary.photos version=2.7.5 -revision=3 +revision=4 build_style=meson hostmakedepends="desktop-file-utils gettext pkg-config vala AppStream glib-devel python3-scour" makedepends="libaccounts-glib-devel libexif-devel libgee08-devel - geocode-glib-libsoup2-devel libgexiv2-devel libglib-devel libgphoto2-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 rest0-devel libsoup-devel sqlite-devel - webkit2gtk-devel libwebp-devel libxml2-devel granite-devel libnotify-devel + json-glib-devel libraw-devel rest0-devel sqlite-devel + libwebp-devel libxml2-devel granite-devel libnotify-devel vte3-devel libhandy1-devel libgomp-devel" depends="desktop-file-utils gsettings-desktop-schemas" short_desc="Photo viewer and organizer designed for elementary OS"