public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
From: Michael Catanzaro <mcatanzaro@gnome.org>
To: git-commits@fedoraproject.org
Subject: [rpms/shotwell] f43: Fix build
Date: Mon, 15 Jun 2026 21:20:05 GMT	[thread overview]
Message-ID: <178155840567.1.18228293789329692429.rpms-shotwell-befff65c07eb@fedoraproject.org> (raw)

            A new commit has been pushed.

            Repo   : rpms/shotwell
            Branch : f43
            Commit : befff65c07eba1a14693dc6fec588f5db56c1c63
            Author : Michael Catanzaro <mcatanzaro@gnome.org>
            Date   : 2026-06-15T16:18:36-05:00
            Stats  : +43/-1 in 2 file(s)
            URL    : https://src.fedoraproject.org/rpms/shotwell/c/befff65c07eba1a14693dc6fec588f5db56c1c63?branch=f43

            Log:
            Fix build

I should learn to check the CI results before clicking merge.

---
diff --git a/fix-metainfo.patch b/fix-metainfo.patch
new file mode 100644
index 0000000..a91951b
--- /dev/null
+++ b/fix-metainfo.patch
@@ -0,0 +1,39 @@
+From 66415dc4afa5cb252ce2067ff9a5d140437fc6c7 Mon Sep 17 00:00:00 2001
+From: Michael Catanzaro <mcatanzaro@gnome.org>
+Date: Mon, 15 Jun 2026 16:14:38 -0500
+Subject: [PATCH] Remove stray quotes in appstream metainfo
+
+These cause 'appstream-util validate-relax' to fail:
+
+/builddir/build/BUILD/shotwell-0.32.17-build/BUILDROOT/usr/share/metainfo/org.gnome.Shotwell.appdata.xml: failed to parse /builddir/build/BUILD/shotwell-0.32.17-build/BUILDROOT/usr/share/metainfo/org.gnome.Shotwell.appdata.xml: Error on line 313 char 6: <releases> already set '"
+    ' and tried to replace with '"
+    '
+---
+ data/org.gnome.Shotwell.appdata.xml.in | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/data/org.gnome.Shotwell.appdata.xml.in b/data/org.gnome.Shotwell.appdata.xml.in
+index 0a7f044b..cfa1b3d0 100644
+--- a/data/org.gnome.Shotwell.appdata.xml.in
++++ b/data/org.gnome.Shotwell.appdata.xml.in
+@@ -62,7 +62,7 @@
+           <li>Fixes an issue where uploading images to Flickr would fail if the title contained non-latin characters</li>
+         </ul>
+       </description>
+-    </release>"
++    </release>
+     <release version="0.32.16" date="2026-06-01" urgency="low" type="stable">
+       <description>
+         <ul>
+@@ -70,7 +70,7 @@
+           <li>Fixes a rare crash in the export dialog</li>
+         </ul>
+       </description>
+-    </release>"
++    </release>
+     <release version="0.32.15" date="2026-03-01" urgency="low" type="stable">
+       <description>
+         <ul>
+-- 
+2.54.0
+

diff --git a/shotwell.spec b/shotwell.spec
index 678f9b7..2d720d5 100644
--- a/shotwell.spec
+++ b/shotwell.spec
@@ -12,6 +12,9 @@ License:        LGPL-2.1-or-later AND CC-BY-SA-3.0
 URL:            https://wiki.gnome.org/Apps/Shotwell
 Source0:        https://download.gnome.org/sources/shotwell/0.32/shotwell-%{version}.tar.xz
 
+# https://gitlab.gnome.org/GNOME/shotwell/-/merge_requests/108
+Patch:          fix-metainfo.patch
+
 BuildRequires:  vala
 BuildRequires:  desktop-file-utils
 BuildRequires:  libappstream-glib >= 0.7.3
@@ -133,7 +136,7 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/org.gnome.Shot
 
 
 %changelog
-* Tue Jun 09 2026 Packit <hello@packit.dev> - 0.32.17-1
+* Tue Jun 09 2026 Michael Catanzaro <mcatanzaro@redhat.com> - 0.32.17-1
 - Update to version 0.32.17
 
 * Mon Mar 02 2026 Packit <hello@packit.dev> - 0.32.15-1

                 reply	other threads:[~2026-06-15 21:20 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=178155840567.1.18228293789329692429.rpms-shotwell-befff65c07eb@fedoraproject.org \
    --to=mcatanzaro@gnome.org \
    --cc=git-commits@fedoraproject.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox