Skip to content

Commit

Permalink
[GTK3] Add patch to fix version number (#2347)
Browse files Browse the repository at this point in the history
  • Loading branch information
giordano authored Jan 5, 2021
1 parent 05d7ef2 commit cd0509c
Show file tree
Hide file tree
Showing 2 changed files with 36 additions and 1 deletion.
13 changes: 12 additions & 1 deletion G/GTK3/build_tarballs.jl
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,17 @@ sources = [
script = raw"""
cd $WORKSPACE/srcdir/gtk+-*/
# Temporary workaround #1 issue with apk
apk add samurai
# Temporary workaround #2: `util-linux` has a file, `/usr/bin/wall`, owned by
# `root:tty`, but `apk` can't chown the file to the `tty` group because it
# doesn't exist in our environment. New `apk` has the option `--no-chown`, so
# let's upgrade `apk` before going on
apk add --upgrade apk-tools --repository=http://dl-cdn.alpinelinux.org/alpine/edge/main
# We need to run some commands with a native Glib
apk add glib-dev gtk+3.0
apk add --no-chown glib-dev gtk+3.0
if [[ "${target}" == *-linux-* ]]; then
# We need to run `wayland-scanner` on the build system only when Wayland is
Expand All @@ -34,6 +43,8 @@ rm -f ${prefix}/bin/wayland-scanner
atomic_patch -p1 $WORKSPACE/srcdir/patches/gdkwindow-quartz_c.patch
atomic_patch -p1 $WORKSPACE/srcdir/patches/meson_build.patch
# The `meson.build` file has the wrong version number in 3.24.11.
atomic_patch -p1 $WORKSPACE/srcdir/patches/meson_build_version_3.24.11.patch
FLAGS=()
if [[ "${target}" == *-apple-* ]]; then
Expand Down
24 changes: 24 additions & 0 deletions G/GTK3/bundled/patches/meson_build_version_3.24.11.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
From 70c4b66d99f66b9da27ded63f2c26e3c13ce07f8 Mon Sep 17 00:00:00 2001
From: Emmanuele Bassi <ebassi@gnome.org>
Date: Sat, 7 Sep 2019 17:44:18 +0100
Subject: [PATCH] Bump up the version in the Meson build file

We already released 3.24.11.
---
meson.build | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meson.build b/meson.build
index 6d6a4d1db7..0029920675 100644
--- a/meson.build
+++ b/meson.build
@@ -1,5 +1,5 @@
project('gtk+-3.0', 'c',
- version: '3.24.10',
+ version: '3.24.11',
default_options: [
'buildtype=debugoptimized',
'warning_level=1'
--
GitLab

0 comments on commit cd0509c

Please sign in to comment.