Source: shotwell
Version: 0.32.15-1
Severity: serious
Tags: ftbfs sid patch

shotwell fails to build with gexiv2 0.16 which is currently in Unstable.

Failed build log excerpt
==================
Run-time dependency gexiv2 found: NO  (tried pkg-config and cmake)

../meson.build:78:9: ERROR: Dependency "gexiv2" not found (tried
pkg-config and cmake)

Patches
======
I am attaching patches. The first 2 patches fix this issue and the
other patches improve the packaging. Alternatively, these changes are
also available at https://salsa.debian.org/jbicha/shotwell

Thank you,
Jeremy Bícha
From 48390d15ebd54e695aec97da50eb8615fb05123c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jeremy=20B=C3=ADcha?= <[email protected]>
Date: Sun, 10 May 2026 10:17:35 -0400
Subject: [PATCH 1/6] Add patch to build with latest gexiv2

---
 .../build-Bump-gexiv2-dependency.patch        | 22 +++++++++++++++++++
 debian/patches/series                         |  1 +
 2 files changed, 23 insertions(+)
 create mode 100644 debian/patches/build-Bump-gexiv2-dependency.patch

diff --git a/debian/patches/build-Bump-gexiv2-dependency.patch b/debian/patches/build-Bump-gexiv2-dependency.patch
new file mode 100644
index 00000000..ac8028b2
--- /dev/null
+++ b/debian/patches/build-Bump-gexiv2-dependency.patch
@@ -0,0 +1,22 @@
+From: Jens Georg <[email protected]>
+Date: Sun, 22 Jun 2025 21:26:42 +0200
+Subject: build: Bump gexiv2 dependency
+
+Origin: upstream master branch
+---
+ meson.build | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/meson.build b/meson.build
+index bf9d8dc..f6c5471 100644
+--- a/meson.build
++++ b/meson.build
+@@ -75,7 +75,7 @@ gstreamer = dependency('gstreamer-1.0', version : '>= 1.20')
+ gstreamer_pbu = dependency('gstreamer-pbutils-1.0', version : '>= 1.20')
+ gphoto2 = dependency('libgphoto2', version : '>= 2.5.0')
+ gudev = dependency('gudev-1.0', version : '>= 145', required: false)
+-gexiv2 = dependency('gexiv2', version: '>= 0.12.3')
++gexiv2 = dependency('gexiv2-0.16', version: '>= 0.15.0')
+ libraw = dependency('libraw', version : '>= 0.13.2')
+ libexif = dependency('libexif', version : '>= 0.6.16')
+ unity = dependency('unity', required : false)
diff --git a/debian/patches/series b/debian/patches/series
index e69de29b..642d04f5 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -0,0 +1 @@
+build-Bump-gexiv2-dependency.patch
-- 
2.53.0

From 87f8b79e555b6ba696d5c0f33ede034ae29b9237 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jeremy=20B=C3=ADcha?= <[email protected]>
Date: Sun, 10 May 2026 10:12:33 -0400
Subject: [PATCH 3/6] Add upstream metadata

---
 debian/upstream/metadata | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 debian/upstream/metadata

diff --git a/debian/upstream/metadata b/debian/upstream/metadata
new file mode 100644
index 00000000..299feb53
--- /dev/null
+++ b/debian/upstream/metadata
@@ -0,0 +1,5 @@
+---
+Bug-Database: https://gitlab.gnome.org/GNOME/shotwell/-/work_items
+Bug-Submit: https://gitlab.gnome.org/GNOME/shotwell/-/work_items/new
+Repository: https://gitlab.gnome.org/GNOME/shotwell.git
+Repository-Browse: https://gitlab.gnome.org/GNOME/shotwell
-- 
2.53.0

From a1365d12c54891c2048e0314a688fd6bc18b8c0d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jeremy=20B=C3=ADcha?= <[email protected]>
Date: Sun, 10 May 2026 10:20:05 -0400
Subject: [PATCH 4/6] Update dh_gnome override to avoid a build warning

---
 debian/rules | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/rules b/debian/rules
index 8d4b33cd..f5823ab1 100755
--- a/debian/rules
+++ b/debian/rules
@@ -16,5 +16,5 @@ override_dh_auto_configure:
 	dh_auto_configure -- \
 	    -Dunity_support=true $(APPORT)
 
-override_dh_gnome_clean:
-	dh_gnome_clean --no-control
+# We only use dh_gnome to automatically run dh_translations in Ubuntu
+override_dh_gnome:
-- 
2.53.0

From 2094477d37d2604980545ac65bbf94be90f9ca1e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jeremy=20B=C3=ADcha?= <[email protected]>
Date: Sun, 10 May 2026 10:17:56 -0400
Subject: [PATCH 2/6] Update minimum gexiv2

---
 debian/control | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian/control b/debian/control
index 723e8755..6dd6625e 100644
--- a/debian/control
+++ b/debian/control
@@ -12,7 +12,7 @@ Build-Depends:
  libexif-dev,
  libgcr-3-dev,
  libgee-0.8-dev,
- libgexiv2-dev,
+ libgexiv2-dev (>= 0.16),
  libglib2.0-dev,
  libgphoto2-dev,
  libgstreamer-plugins-base1.0-dev,
-- 
2.53.0

From 9a037abda13138d63667a03183b6d2c2e8d6cf93 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jeremy=20B=C3=ADcha?= <[email protected]>
Date: Sun, 10 May 2026 10:21:11 -0400
Subject: [PATCH 5/6] Remove --buildsystem=meson since it's already the default

---
 debian/rules | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian/rules b/debian/rules
index f5823ab1..08d3e4dd 100755
--- a/debian/rules
+++ b/debian/rules
@@ -10,7 +10,7 @@ ifeq ($(shell dpkg-vendor --derives-from Ubuntu && echo yes),yes)
 endif
 
 %:
-	dh $@  --buildsystem=meson
+	dh $@
 
 override_dh_auto_configure:
 	dh_auto_configure -- \
-- 
2.53.0

From a8f02f964020f3db5c264a699449f8624953b979 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jeremy=20B=C3=ADcha?= <[email protected]>
Date: Sun, 10 May 2026 10:21:50 -0400
Subject: [PATCH 6/6] Remove unnecessary VALAFLAGS configuration

---
 debian/rules | 2 --
 1 file changed, 2 deletions(-)

diff --git a/debian/rules b/debian/rules
index 08d3e4dd..736923b1 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,8 +2,6 @@
 
 export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 
-export VALAFLAGS:=$(foreach w,$(CPPFLAGS) $(CFLAGS) $(LDFLAGS),-X $(w))
-
 #Enable the apport option when building of Ubuntu
 ifeq ($(shell dpkg-vendor --derives-from Ubuntu && echo yes),yes)
 		APPORT = -Dinstall_apport_hook=true
-- 
2.53.0

Reply via email to