From 6edcf4a90a0f80f6112ac4c29d2a311de8bdd0d0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Wed, 4 May 2022 20:52:40 +0200 Subject: New debian/patches/0110-use_relative_lib_path.patch --- debian/changelog | 8 ++++++++ debian/patches/0110-use_relative_lib_path.patch | 22 ++++++++++++++++++++++ debian/patches/series | 1 + 3 files changed, 31 insertions(+) create mode 100644 debian/patches/0110-use_relative_lib_path.patch (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index e38e9cf..85745f5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +shotwell (0.30.15-2) UNRELEASED; urgency=medium + + * New debian/patches/0110-use_relative_lib_path.patch: + - Use relative path for libs (Closes: #1010571). + Thanks to Neil McGovern . + + -- Jörg Frings-Fürst Wed, 04 May 2022 19:36:55 +0200 + shotwell (0.30.15-1) unstable; urgency=medium * New upstream release. diff --git a/debian/patches/0110-use_relative_lib_path.patch b/debian/patches/0110-use_relative_lib_path.patch new file mode 100644 index 0000000..34b366c --- /dev/null +++ b/debian/patches/0110-use_relative_lib_path.patch @@ -0,0 +1,22 @@ +Description: Use relative path for lib +Author: +Origin: upstream, https://gitlab.gnome.org/GNOME/shotwell/-/commit/b3216719e9504518d6866adaaec532e5a7c09481 +Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1010571 +Forwarded: not-needed +Applied-Upstream: commit +Last-Update: 2022-05-04 +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ +Index: trunk/meson.build +=================================================================== +--- trunk.orig/meson.build ++++ trunk/meson.build +@@ -12,7 +12,7 @@ conf.set('_VERSION', '"@0@"'.format(meso + conf.set('_PREFIX', '"@0@"'.format(get_option('prefix'))) + conf.set('_LANG_SUPPORT_DIR', '"@0@"'.format(join_paths(get_option('prefix'), get_option('localedir')))) + conf.set('_LIBEXECDIR', '"@0@"'.format(join_paths(get_option('prefix'), get_option('libexecdir')))) +-conf.set('_LIB', '"@0@"'.format(join_paths(get_option('prefix'), get_option('libdir')))) ++conf.set('_LIB', '"@0@"'.format(get_option('libdir'))) + configure_file(output : 'config.h', configuration: conf) + + config_incdir = include_directories('.') diff --git a/debian/patches/series b/debian/patches/series index 5f63750..7063390 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1 +1,2 @@ #0105-gitversion.patch +0110-use_relative_lib_path.patch -- cgit v1.2.3