Merge pull request #6211 from lazka/gtk3-3.24.14

gtk3: Update to 3.24.14
This commit is contained in:
Алексей
2020-02-19 11:21:23 +03:00
committed by GitHub
2 changed files with 2 additions and 20 deletions

View File

@@ -1,13 +0,0 @@
diff --git a/gtk/meson.build b/gtk/meson.build
index 5a0b1547d8..b008eba4fd 100644
--- a/gtk/meson.build
+++ b/gtk/meson.build
@@ -682,7 +682,7 @@ gtk_gresources_xml = configure_file(output: 'gtk.gresources.xml',
# Re-build the theme files if sassc is available
theme_deps = []
sassc = find_program('sassc', required: false)
-if sassc.found()
+if sassc.found() and false
sassc_opts = [ '-a', '-M', '-t', 'compact' ]
subdir('theme/Adwaita')

View File

@@ -3,7 +3,7 @@
_realname=gtk3
pkgbase=mingw-w64-${_realname}
pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
pkgver=3.24.13
pkgver=3.24.14
pkgrel=1
pkgdesc="GObject-based multi-platform GUI toolkit (v3) (mingw-w64)"
arch=('any')
@@ -29,20 +29,15 @@ depends=("${MINGW_PACKAGE_PREFIX}-gcc-libs"
"${MINGW_PACKAGE_PREFIX}-shared-mime-info")
options=('strip' '!debug' 'staticlibs')
source=("https://download.gnome.org/sources/gtk+/${pkgver%.*}/gtk+-${pkgver}.tar.xz"
"0001-disable-sass-rebuild.patch"
"0002-Revert-Quartz-Set-the-popup-menu-type-hint-before-re.patch"
"0003-gtkwindow-Don-t-force-enable-CSD-under-Windows.patch")
sha256sums=('4c775c38cf1e3c534ef0ca52ca6c7a890fe169981af66141c713e054e68930a9'
'4c4b597c4a1fb2d4ba7f90741c317be9eeb2053a09a80c2e1095b34b1d86ef06'
sha256sums=('1c4d69f93ab884fd80c6b95115bfbc12d51ecd029178b6dad3672fdc5ff91e88'
'5cdebb11098d241da955d4662904215275fa7a54d52877cc38c4ff4a3087fafd'
'b84a7f38f0af80680bee143d431f2a7bae53899efb337de0f67a1b4d9b59fa02')
prepare() {
cd "${srcdir}/gtk+-${pkgver}"
# https://gitlab.gnome.org/GNOME/gtk/issues/2237
patch -p1 -i "${srcdir}"/0001-disable-sass-rebuild.patch
# https://gitlab.gnome.org/GNOME/gtk/issues/2019
patch -p1 -i "${srcdir}"/0002-Revert-Quartz-Set-the-popup-menu-type-hint-before-re.patch