[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[bug#62467] [PATCH gnome-team v2 09/12] gnu: gtk+-2: Fix build by harden
From: |
Maxim Cournoyer |
Subject: |
[bug#62467] [PATCH gnome-team v2 09/12] gnu: gtk+-2: Fix build by hardening list store. |
Date: |
Sun, 09 Apr 2023 01:06:18 -0400 |
User-agent: |
Gnus/5.13 (Gnus v5.13) Emacs/28.2 (gnu/linux) |
Hi Liliana,
Liliana Marie Prikler <liliana.prikler@gmail.com> writes:
> Am Samstag, dem 08.04.2023 um 15:47 -0400 schrieb Maxim Cournoyer:
>> Hi,
>>
>> Liliana Marie Prikler <liliana.prikler@gmail.com> writes:
>>
>> > * gnu/packages/patches/gtk2-harden-list-store.patch: New file.
>> > * gnu/packages/gtk.scm (gtk+-2)[patches]: Add it here.
>> > * gnu/local.mk (dist_patch_DATA): Register it here.
>> > ---
>> > gnu/local.mk | 1 +
>> > gnu/packages/gtk.scm | 1 +
>> > .../patches/gtk2-harden-list-store.patch | 42
>> > +++++++++++++++++++
>> > 3 files changed, 44 insertions(+)
>> > create mode 100644 gnu/packages/patches/gtk2-harden-list-
>> > store.patch
>> >
>> > diff --git a/gnu/local.mk b/gnu/local.mk
>> > index 3e94281ccf..31456c5be8 100644
>> > --- a/gnu/local.mk
>> > +++ b/gnu/local.mk
>> > @@ -1303,6 +1303,7 @@ dist_patch_DATA
>> > = \
>> > %D%/packages/patches/guile-rsvg-pkgconfig.patch \
>> > %D%/packages/patches/guile-emacs-fix-configure.patch \
>> > %D%/packages/patches/gtk2-fix-builder-test.patch \
>> > + %D%/packages/patches/gtk2-harden-list-store.patch \
>> > %D%/packages/patches/gtk2-respect-GUIX_GTK2_PATH.patch \
>> > %D%/packages/patches/gtk2-respect-GUIX_GTK2_IM_MODULE_FILE.patch
>> > \
>> > %D%/packages/patches/gtk2-theme-paths.patch \
>> > diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm
>> > index c756f39e24..196d767160 100644
>> > --- a/gnu/packages/gtk.scm
>> > +++ b/gnu/packages/gtk.scm
>> > @@ -1014,6 +1014,7 @@ (define-public gtk+-2
>> >
>> > "1nn6kks1zyvb5xikr9y2k7r9bwjy1g4b0m0s66532bclymbwfamc"))
>> > (patches (search-patches "gtk2-respect-
>> > GUIX_GTK2_PATH.patch"
>> > "gtk2-respect-
>> > GUIX_GTK2_IM_MODULE_FILE.patch"
>> > + "gtk2-harden-list-
>> > store.patch"
>> > "gtk2-theme-paths.patch"
>> > "gtk2-fix-builder-
>> > test.patch"))))
>> > (build-system gnu-build-system)
>> > diff --git a/gnu/packages/patches/gtk2-harden-list-store.patch
>> > b/gnu/packages/patches/gtk2-harden-list-store.patch
>> > new file mode 100644
>> > index 0000000000..b107ba2bcc
>> > --- /dev/null
>> > +++ b/gnu/packages/patches/gtk2-harden-list-store.patch
>> > @@ -0,0 +1,42 @@
>> > +Mimic the implemenetation in gtk+-3.
>>
>> Typo: implementation.
> Nice catch.
>
>> I'd like to see a bit more metadata in this patch; is it original
>> work, or was it retrieved from another distribution such as Debian?
>> It probably exists elsewhere, if GTK2 can't be built anymore
>> otherwise?
> I looked around in the GTK 3 source tree given that that package built,
> but GTK 2 didn't, then tried to copy the file as-is, failed, then
> copied just these relevant bits. I haven't looked at prior art in
> other distros.
>
>> Does upstream still maintain GTK2, or is it completely abandoned?
> As far as I can see, we're running the latest version.
OK! Perhaps stress the point more that this is backported from GTK 3 in
the patch metadata (top comment).
LGTM with this.
--
Thanks,
Maxim