Dear maintainer,
Please find attached a final version of this patch for the time_t
transition. This patch is being uploaded to unstable.
Note that this adds a versioned build-dependency on dpkg-dev, to guard
against accidental backports with a wrong ABI.
Thanks!
-- System Information:
Debian Release: trixie/sid
APT prefers unstable
APT policy: (500, 'unstable'), (1, 'experimental')
Architecture: amd64 (x86_64)
Kernel: Linux 6.5.0-14-generic (SMP w/12 CPU threads; PREEMPT)
Kernel taint flags: TAINT_PROPRIETARY_MODULE, TAINT_OOT_MODULE
Locale: LANG=C, LC_CTYPE=C.UTF-8 (charmap=UTF-8), LANGUAGE not set
Shell: /bin/sh linked to /usr/bin/dash
Init: systemd (via /run/systemd/system)
diff -Nru wpewebkit-2.42.5/debian/changelog wpewebkit-2.42.5/debian/changelog
--- wpewebkit-2.42.5/debian/changelog 2024-02-05 16:36:25.000000000 +0000
+++ wpewebkit-2.42.5/debian/changelog 2024-02-29 09:23:10.000000000 +0000
@@ -1,3 +1,10 @@
+wpewebkit (2.42.5-1.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Rename libraries for 64-bit time_t transition. Closes: #1063223
+
+ -- Steve Langasek <vor...@debian.org> Thu, 29 Feb 2024 09:23:10 +0000
+
wpewebkit (2.42.5-1) unstable; urgency=high
* New upstream release.
diff -Nru wpewebkit-2.42.5/debian/control wpewebkit-2.42.5/debian/control
--- wpewebkit-2.42.5/debian/control 2024-02-05 16:36:25.000000000 +0000
+++ wpewebkit-2.42.5/debian/control 2024-02-29 09:23:10.000000000 +0000
@@ -4,7 +4,7 @@
Priority: optional
Maintainer: Debian WebKit Maintainers
<pkg-webkit-maintain...@lists.alioth.debian.org>
Uploaders: Alberto Garcia <be...@igalia.com>
-Build-Depends: debhelper-compat (= 13),
+Build-Depends: dpkg-dev (>= 1.22.5), debhelper-compat (= 13),
bubblewrap [!alpha !ia64 !riscv64 !sh4 !sparc64],
xdg-dbus-proxy [!alpha !ia64 !riscv64 !sh4 !sparc64],
libseccomp-dev [!alpha !ia64 !riscv64 !sh4 !sparc64],
@@ -51,7 +51,7 @@
Section: libdevel
Architecture: linux-any
Multi-Arch: same
-Depends: libwpewebkit-1.1-0 (= ${binary:Version}),
+Depends: libwpewebkit-1.1-0t64 (= ${binary:Version}),
libglib2.0-dev,
libsoup-3.0-dev,
libwpe-1.0-dev,
@@ -73,7 +73,10 @@
.
This package contains the development files.
-Package: libwpewebkit-1.1-0
+Package: libwpewebkit-1.1-0t64
+Provides: ${t64:Provides}
+Replaces: libwpewebkit-1.1-0
+Breaks: libwpewebkit-1.1-0 (<< ${source:Version})
Architecture: linux-any
Multi-Arch: same
Depends: ${shlibs:Depends}, ${misc:Depends},
diff -Nru wpewebkit-2.42.5/debian/control.in wpewebkit-2.42.5/debian/control.in
--- wpewebkit-2.42.5/debian/control.in 2024-02-05 16:36:25.000000000 +0000
+++ wpewebkit-2.42.5/debian/control.in 2024-02-29 09:23:07.000000000 +0000
@@ -73,6 +73,9 @@
This package contains the development files.
Package: @LIBWPEWEBKIT_PKG@
+Provides: ${t64:Provides}
+Replaces: libwpewebkit-1.1-0
+Breaks: libwpewebkit-1.1-0 (<< ${source:Version})
Architecture: linux-any
Multi-Arch: same
Depends: ${shlibs:Depends}, ${misc:Depends},
diff -Nru wpewebkit-2.42.5/debian/libwpewebkit-1.0-3.lintian-overrides
wpewebkit-2.42.5/debian/libwpewebkit-1.0-3.lintian-overrides
--- wpewebkit-2.42.5/debian/libwpewebkit-1.0-3.lintian-overrides
2024-02-05 16:36:25.000000000 +0000
+++ wpewebkit-2.42.5/debian/libwpewebkit-1.0-3.lintian-overrides
2024-02-29 09:23:08.000000000 +0000
@@ -1,2 +1,3 @@
libwpewebkit-1.0-3: library-not-linked-against-libc
[usr/lib/*/wpe-webkit-1.0/injected-bundle/libWPEInjectedBundle.so]
libwpewebkit-1.0-3: library-not-linked-against-libc
[usr/lib/*/wpe-webkit-1.0/libWPEWebInspectorResources.so]
+libwpewebkit-1.0-3: package-name-doesnt-match-sonames libwpewebkit-1.1-0
diff -Nru wpewebkit-2.42.5/debian/rules wpewebkit-2.42.5/debian/rules
--- wpewebkit-2.42.5/debian/rules 2024-02-05 16:36:25.000000000 +0000
+++ wpewebkit-2.42.5/debian/rules 2024-02-29 09:23:08.000000000 +0000
@@ -33,7 +33,7 @@
else
EXTRA_CMAKE_ARGUMENTS += -DUSE_SOUP2=OFF -DENABLE_WPE_1_1_API=ON
WK_API_VERSION = 1.1
- LIBWPEWEBKIT_PKG = libwpewebkit-1.1-0
+ LIBWPEWEBKIT_PKG = libwpewebkit-1.1-0t64
SOUPDEV_PKG = libsoup-3.0-dev
endif
@@ -137,7 +137,7 @@
libwpewebkit-1.0-dev.install
# This converts debhelper file names and contents to the soup3 versions
-WEBKIT_DH_RENAME = sed -e 's/1\.0-3/1.1-0/g' \
+WEBKIT_DH_RENAME = sed -e 's/1\.0-3/1.1-0t64/g' \
-e 's/1\.0\.so\.3/1.1.so.0/g' \
-e 's/1\.0/1.1/g'
