From: Peter Michael Green Date: Thu, 3 Apr 2025 16:20:21 +0000 (+0000) Subject: Manual merge of version 2.46.5-1+rpi1 and 2.48.0-1 to produce 2.48.0-1+rpi1 X-Git-Tag: archive/raspbian/2.48.0-1+rpi1~1 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=4e569e7f0c7e1c688dd9b7f204b27cf9441723e8;p=webkit2gtk.git Manual merge of version 2.46.5-1+rpi1 and 2.48.0-1 to produce 2.48.0-1+rpi1 --- 4e569e7f0c7e1c688dd9b7f204b27cf9441723e8 diff --cc debian/changelog index 165f2967c3,dc4ffce722..c8b76bda3b --- a/debian/changelog +++ b/debian/changelog @@@ -1,10 -1,51 +1,59 @@@ - webkit2gtk (2.46.5-1+rpi1) trixie-staging; urgency=medium ++webkit2gtk (2.48.0-1+rpi1) trixie-staging; urgency=medium + + [changes brought forward from 2.6.2+dfsg1-3+rpi1 by Peter Michael Green at Sun, 25 Jan 2015 02:14:50 +0000] + * Disable javascript JIT as it doesn't appear to be armv6 compatible + (at least I assume that is the cause of the assembler errors) + - -- Peter Michael Green Tue, 07 Jan 2025 18:20:16 +0000 ++ -- Peter Michael Green Thu, 03 Apr 2025 16:19:18 +0000 ++ + webkit2gtk (2.48.0-1) unstable; urgency=medium + + * New upstream release. + * Bring all changes from the 2.47 (experimental) branch. + * debian/source/lintian-overrides: + - Update source-is-missing overrides. + * Remove libwebkit2gtk-4.0-37.lintian-overrides. + * debian/control.in: + - Add build dependency on flite1-dev (for speech synthesis). + - Remove the minimum versions of all build dependencies in the cases + where they are very old. + - Remove build dependencies on all lib*-doc packages. + * Enable clang again in the architectures where it's available and known + to work. + * Replace USE_OLD_*_PKG with USE_OLD_PKG_NAMES. + * debian/copyright: + - Update copyright information of all files. + * debian/gbp.conf: + - Update upstream branch name. + * debian/libwebkit2gtk-4.0-37.symbols: + - Update symbols. + * fix-bmalloc-armhf.patch: + - Drop this patch, the armhf build works fine now without it. + * fix-ftbfs-hurd.patch: + - Drop this patch, I forgot to do it in 2.46.1-2. + * disable-nvidia-dmabuf.patch: + - Update this patch for the 2.48.x branch. + * debian/rules: + - Stop overriding dh_builddeb, running it in parallel used to be a + problem when we were building without -g1 and had very large debug + packages. + + -- Alberto Garcia Fri, 14 Mar 2025 23:12:01 +0100 + + webkit2gtk (2.46.6-1) unstable; urgency=high + + * New upstream release (Closes: #1092311). + * Refresh debian/patches/disable-nvidia-dmabuf.patch + * debian/copyright: + - Update copyright information of all files. + * debian/rules: + - Stop using -DWTF_CPU_ARM64_CORTEXA53=OFF, this was fixed upstream a + long time ago (WebKit bug #197192). + * debian/upstream/signing-key.asc: + - sq complains about multiple concatenated ASCII Armor blocks, so put + all keys in the same block. + + -- Alberto Garcia Fri, 07 Feb 2025 14:40:10 +0100 webkit2gtk (2.46.5-1) unstable; urgency=medium diff --cc debian/rules index 286ac93763,bfac162d7b..81aac21a91 --- a/debian/rules +++ b/debian/rules @@@ -71,16 -74,6 +74,11 @@@ ifneq (,$(filter $(DEB_HOST_ARCH),loong EXTRA_CMAKE_ARGUMENTS += -DUSE_SKIA=OFF endif - # See https://bugs.webkit.org/show_bug.cgi?id=197192 - ifneq (,$(filter $(DEB_HOST_ARCH),arm64)) - EXTRA_CMAKE_ARGUMENTS += -DWTF_CPU_ARM64_CORTEXA53=OFF - endif - +# https://bugs.webkit.org/show_bug.cgi?id=188862 +ifneq (,$(filter $(DEB_HOST_ARCH),armel armhf)) + EXTRA_CMAKE_ARGUMENTS += -DENABLE_JIT=OFF +endif + ifneq (,$(filter noopt,$(DEB_BUILD_OPTIONS))) EXTRA_CMAKE_ARGUMENTS += -DUSE_SYSTEM_MALLOC=ON CPPFLAGS += -DRELEASE_WITHOUT_OPTIMIZATIONS