Jan Alexander Steffens (heftig) pushed to branch main at Arch Linux / Packaging
/ Packages / gtk4
Commits:
2d653761 by Jan Alexander Steffens (heftig) at 2023-10-26T14:10:32+02:00
4.12.3-2: unbreak -fcf-protection
- - - - -
3 changed files:
- .SRCINFO
- PKGBUILD
- + force-no-objcopy.diff
Changes:
=====================================
.SRCINFO
=====================================
@@ -1,7 +1,7 @@
pkgbase = gtk4
pkgdesc = GObject-based multi-platform GUI toolkit
pkgver = 4.12.3
- pkgrel = 1
+ pkgrel = 2
epoch = 1
url = https://www.gtk.org/
arch = x86_64
@@ -66,11 +66,13 @@ pkgbase = gtk4
source = gtk-update-icon-cache.script
source = gtk4-querymodules.hook
source = gtk4-querymodules.script
+ source = force-no-objcopy.diff
b2sums = SKIP
b2sums =
136bdb410c46daf769175e8e8837286576391797a4762b8cf388217e893dd6c5087c5c91c347cbdf7d3e9dcd2c978c2fb275b5af1f3425c9f7979fbc65a81324
b2sums =
6bcd839ef82296d864587e0cc7acc0145bdea8e5235af304747cf3c0e564c2757cc67c0373dc044bec83dccfc57dc899546c2fccea96cff2bba22f09978a3814
b2sums =
dd589bd1ad2b13f0e06f6899776a083f20a1aac24d4308d666ffd0d1cff38457b8257b8366f92e767b4233b3d86b6b54fa50339faf84c4801a824986366dce30
b2sums =
4b90eb8d582509b09aab401313d4399cc139ad21b5dd7d45d79860d0764c7494c60714e0794e09823e51d1894ac032a994f27d79d1499abf24ee6f59bdb0c243
+ b2sums =
0392de7d8700a69a5959f0ad62a9910e0a007db014926a8b351bbcc577ca8dda693883ebac8e403510c8a581ec73dd34a56f0fd9eb24cc6707d458d5175851f7
pkgname = gtk4
depends = adwaita-icon-theme
=====================================
PKGBUILD
=====================================
@@ -8,7 +8,7 @@ pkgname=(
gtk-update-icon-cache
)
pkgver=4.12.3
-pkgrel=1
+pkgrel=2
epoch=1
pkgdesc="GObject-based multi-platform GUI toolkit"
url="https://www.gtk.org/";
@@ -80,12 +80,14 @@ source=(
"git+https://gitlab.gnome.org/GNOME/gtk.git#commit=$_commit";
gtk-update-icon-cache.{hook,script}
gtk4-querymodules.{hook,script}
+ force-no-objcopy.diff
)
b2sums=('SKIP'
'136bdb410c46daf769175e8e8837286576391797a4762b8cf388217e893dd6c5087c5c91c347cbdf7d3e9dcd2c978c2fb275b5af1f3425c9f7979fbc65a81324'
'6bcd839ef82296d864587e0cc7acc0145bdea8e5235af304747cf3c0e564c2757cc67c0373dc044bec83dccfc57dc899546c2fccea96cff2bba22f09978a3814'
'dd589bd1ad2b13f0e06f6899776a083f20a1aac24d4308d666ffd0d1cff38457b8257b8366f92e767b4233b3d86b6b54fa50339faf84c4801a824986366dce30'
-
'4b90eb8d582509b09aab401313d4399cc139ad21b5dd7d45d79860d0764c7494c60714e0794e09823e51d1894ac032a994f27d79d1499abf24ee6f59bdb0c243')
+
'4b90eb8d582509b09aab401313d4399cc139ad21b5dd7d45d79860d0764c7494c60714e0794e09823e51d1894ac032a994f27d79d1499abf24ee6f59bdb0c243'
+
'0392de7d8700a69a5959f0ad62a9910e0a007db014926a8b351bbcc577ca8dda693883ebac8e403510c8a581ec73dd34a56f0fd9eb24cc6707d458d5175851f7')
pkgver() {
cd gtk
@@ -98,6 +100,10 @@ prepare() {
# https://bugs.archlinux.org/task/79310
# https://gitlab.gnome.org/GNOME/gtk/-/merge_requests/6250
git cherry-pick -n 4d7277f72c8f4915f237e36982ffd7dfba524b15
+
+ # Allow -fcf-protection to work
+ # https://gitlab.gnome.org/GNOME/gtk/-/issues/6153
+ git apply -3 ../force-no-objcopy.diff
}
build() {
=====================================
force-no-objcopy.diff
=====================================
@@ -0,0 +1,13 @@
+diff --git i/meson.build w/meson.build
+index c6653d3d00..9bf0b35f68 100644
+--- i/meson.build
++++ w/meson.build
+@@ -763,7 +763,7 @@ if ld.found()
+ endif
+
+ if not meson.is_cross_build() and build_machine.cpu_family() == 'x86_64' and
build_machine.system() == 'linux' and objcopy.found() and
objcopy_supports_add_symbol and objcopy_supports_section_alignment and
ld.found() and ld_is_bfd
+- can_use_objcopy_for_resources = true
++ can_use_objcopy_for_resources = false
+ else
+ can_use_objcopy_for_resources = false
+ endif
View it on GitLab:
https://gitlab.archlinux.org/archlinux/packaging/packages/gtk4/-/commit/2d6537613b151b3070d91e9788c87932779a93f9
--
View it on GitLab:
https://gitlab.archlinux.org/archlinux/packaging/packages/gtk4/-/commit/2d6537613b151b3070d91e9788c87932779a93f9
You're receiving this email because of your account on gitlab.archlinux.org.
