Skip to content
Snippets Groups Projects
Commit 187766b0 authored by Bernhard Landauer's avatar Bernhard Landauer
Browse files

v3.24.0+33+g8fd2d461fc

parent 0749fc5e
No related branches found
No related tags found
No related merge requests found
gtk/*
gtk+*
*.xz *.xz
*.hook *.hook
gtk3-mushrooms/* gtk3-mushrooms/*
......
...@@ -2,12 +2,13 @@ ...@@ -2,12 +2,13 @@
# Maintainer: Tomasz Gąsior <tomaszgasior.pl> # Maintainer: Tomasz Gąsior <tomaszgasior.pl>
_repo=gtk3-mushrooms _repo=gtk3-mushrooms
__gnome_commit=4858f4b46ef19db884afb71957fe1d6a67d88915
__arch_pkg_commit=a97a4614dfdb3a2f0c97ed58f94385ecc9b16b1e __arch_pkg_commit=a97a4614dfdb3a2f0c97ed58f94385ecc9b16b1e
_pkgname=lib32-gtk3 _pkgname=lib32-gtk3
pkgname=$_pkgname-classic pkgname=$_pkgname-classic
pkgver=3.22.30 pkgver=3.24.0+33+g8fd2d461fc
pkgrel=6.1 pkgrel=2
pkgdesc="GTK3 patched for classic desktops like MATE/XFCE (see README)." pkgdesc="GTK3 patched for classic desktops like MATE/XFCE (see README)."
url="https://github.com/TomaszGasior/gtk3-mushrooms" url="https://github.com/TomaszGasior/gtk3-mushrooms"
_archgit=https://git.archlinux.org/svntogit/community.git/plain/trunk _archgit=https://git.archlinux.org/svntogit/community.git/plain/trunk
...@@ -18,7 +19,7 @@ license=(LGPL) ...@@ -18,7 +19,7 @@ license=(LGPL)
depends=( depends=(
adwaita-icon-theme adwaita-icon-theme
cantarell-fonts cantarell-fonts
gtk3-classic "gtk3-classic>=${pkgver}"
lib32-at-spi2-atk lib32-at-spi2-atk
lib32-colord lib32-colord
lib32-dbus lib32-dbus
...@@ -49,23 +50,17 @@ makedepends=( ...@@ -49,23 +50,17 @@ makedepends=(
) )
source=( source=(
# GTK source code. # GTK source code.
"https://download.gnome.org/sources/gtk+/${pkgver%.*}/gtk+-$pkgver.tar.xz" "git+https://gitlab.gnome.org/GNOME/gtk.git#commit=$__gnome_commit"
# Temporary. Will be removed with next GTK3 release.
"upstream_transparent_window_bg_1._patch::https://github.com/GNOME/gtk/commit/2ce63a86ba689aa41eb47409c889c469497478b0.patch"
"upstream_transparent_window_bg_2._patch::https://github.com/GNOME/gtk/commit/01d1bc3c75fd0eff5665f5b9c690c5e1e6c65f13.patch"
"gtk-query-immodules-3.0-32.hook::$_archgit/gtk-query-immodules-3.0-32.hook?h=packages/$_pkgname&id=$__arch_pkg_commit" "gtk-query-immodules-3.0-32.hook::$_archgit/gtk-query-immodules-3.0-32.hook?h=packages/$_pkgname&id=$__arch_pkg_commit"
# gtk3-mushrooms patches # gtk3-mushrooms patches
"git+$url.git" "git+$url.git"
# trayicons background patch https://github.com/TomaszGasior/gtk3-mushrooms/issues/12 # trayicons background patch https://github.com/TomaszGasior/gtk3-mushrooms/issues/12
'fixes__gtktrayicon-background.patch' 'fixes__gtktrayicon-background.patch'
) )
sha256sums=('a1a4a5c12703d4e1ccda28333b87ff462741dc365131fbc94c218ae81d9a6567' sha256sums=('SKIP'
'ceb95c0952ccd3ded84cd55a2386a33edac91597052b077d12fa4a3cc62a1612'
'68e3ea59140ee565a146fff2db2d2e2ed99536bbad8ba818bee124325d516e01'
'4ac8112ac7e6fa879756e1eeb89b5efa0825ba00e5b05469913b256f86a37608' '4ac8112ac7e6fa879756e1eeb89b5efa0825ba00e5b05469913b256f86a37608'
'SKIP' 'SKIP'
'57086d7b73b8631bf1a44ff1db255333e8244ae6bd2c1617d540397f78790f7b') 'b6bb9c928d27faf52b8a8bc1be1abfcb45a5bc78602ea1fcd76d984774ce68b0')
__patch_makefiles() { __patch_makefiles() {
__replace_string_in_file() { __replace_string_in_file() {
...@@ -103,7 +98,7 @@ __patch_gtk_code() { ...@@ -103,7 +98,7 @@ __patch_gtk_code() {
} }
prepare() { prepare() {
cd "$srcdir/gtk+-$pkgver" cd $srcdir/gtk
# Make building faster by skipping tests, code examples and unused elements. # Make building faster by skipping tests, code examples and unused elements.
__patch_makefiles __patch_makefiles
...@@ -111,16 +106,14 @@ prepare() { ...@@ -111,16 +106,14 @@ prepare() {
# Apply patches to GTK code. # Apply patches to GTK code.
__patch_gtk_code __patch_gtk_code
# Temporary. Will be removed with next GTK3 release. # trayicons background patch https://github.com/TomaszGasior/gtk3-mushrooms/issues/12
patch -p 1 -i "$srcdir/upstream_transparent_window_bg_1._patch"
patch -p 1 -i "$srcdir/upstream_transparent_window_bg_2._patch"
patch -p 1 -i "$srcdir/fixes__gtktrayicon-background.patch" patch -p 1 -i "$srcdir/fixes__gtktrayicon-background.patch"
NOCONFIGURE=1 ./autogen.sh NOCONFIGURE=1 ./autogen.sh
} }
build() { build() {
cd "gtk+-$pkgver" cd $srcdir/gtk
export CC='gcc -m32' export CC='gcc -m32'
export CXX='/bin/false' export CXX='/bin/false'
...@@ -143,7 +136,7 @@ build() { ...@@ -143,7 +136,7 @@ build() {
} }
package() { package() {
cd "gtk+-$pkgver" cd $srcdir/gtk
make DESTDIR="$pkgdir" install make DESTDIR="$pkgdir" install
......
...@@ -8,4 +8,3 @@ ...@@ -8,4 +8,3 @@
+ GDK_WINDOW_XID (window), ParentRelative); + GDK_WINDOW_XID (window), ParentRelative);
} }
G_GNUC_END_IGNORE_DEPRECATIONS G_GNUC_END_IGNORE_DEPRECATIONS
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment