Skip to content

Commit

Permalink
gtk3: Update to 3.24.12
Browse files Browse the repository at this point in the history
  • Loading branch information
@Alexpux
Alexpux committed Oct 4, 2019
1 parent 106b40e commit ff2258b
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 42 deletions.
35 changes: 0 additions & 35 deletions mingw-w64-gtk3/0001-gtkwindow-Don-t-force-enable-CSD-under-Windows.patch
View file

This file was deleted.

9 changes: 2 additions & 7 deletions mingw-w64-gtk3/PKGBUILD
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
_realname=gtk3
pkgbase=mingw-w64-${_realname}
pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
pkgver=3.24.11
pkgver=3.24.12
pkgrel=1
pkgdesc="GObject-based multi-platform GUI toolkit (v3) (mingw-w64)"
arch=('any')
Expand All @@ -29,18 +29,13 @@ 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-gtkwindow-Don-t-force-enable-CSD-under-Windows.patch"
"0002-Revert-Quartz-Set-the-popup-menu-type-hint-before-re.patch")
sha256sums=('dba7658d0a2e1bfad8260f5210ca02988f233d1d86edacb95eceed7eca982895'
'f6f8019e21b2932ee2cfb3b261d57b79f6492d4f0a61f9fbf5b8edd193758d9a'
sha256sums=('1384eba5614fed160044ae0d32369e3df7b4f517b03f4b1f24d383e528f4be83'
'5cdebb11098d241da955d4662904215275fa7a54d52877cc38c4ff4a3087fafd')

prepare() {
cd "${srcdir}/gtk+-${pkgver}"

# https://bugzilla.gnome.org/show_bug.cgi?id=778791
patch -p1 -i "${srcdir}"/0001-gtkwindow-Don-t-force-enable-CSD-under-Windows.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
}
Expand Down

9 comments on commit ff2258b

@lazka
Copy link
Member

@lazka lazka commented on ff2258b Nov 7, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@Alexpux why was the patch dropped?

@Alexpux
Copy link
Member Author

@Alexpux Alexpux commented on ff2258b Nov 7, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@lazka maybe because it was merged? No?

@lazka
Copy link
Member

@lazka lazka commented on ff2258b Nov 7, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It wasn't merged, but maybe it needs an update. OK if I try to add the patch back?

@Alexpux
Copy link
Member Author

@Alexpux Alexpux commented on ff2258b Nov 7, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It’s ok

@totaam
Copy link
Contributor

@totaam totaam commented on ff2258b Nov 7, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

FYI: I've just wasted days trying to figure out what was going wrong with the geometry of my windows... it was the GTK3 update that had dropped the patch :(
BTW, thanks for coming up with the patch: GTK3 would be completely unusable for us without it.

@lazka
Copy link
Member

@lazka lazka commented on ff2258b Nov 7, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If CSD breaks your app it is also broken under wayland, so you should still look into that (window size and content size are no longer the same with it for example, which breaks some older logic)

@totaam
Copy link
Contributor

@totaam totaam commented on ff2258b Nov 8, 2019 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If CSD breaks your app it is also broken under wayland
.. which breaks some older logic

Unfortunately, we are well aware that this is the case.
For Xpra, we require a toolkit that allows us to reliably request a specific window size (internal, without counting the decorations or title bar), which is what every other toolkit does, including GTK2. This seems to be impossible with GTK3 and CSD.

@lazka
Copy link
Member

@lazka lazka commented on ff2258b Nov 9, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

gtk is currently not buildable because of libsass upstream breakage, so this will have to wait a bit.

@lazka
Copy link
Member

@lazka lazka commented on ff2258b Nov 22, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

See #5986

Please sign in to comment.