Skip to content
Snippets Groups Projects
Commit cbef342b authored by Philip Müller's avatar Philip Müller
Browse files
parents 36626f50 b15b3c50
No related branches found
No related tags found
No related merge requests found
gtk/*
gtk+*
*.xz *.xz
*.hook *.hook
gtk3-mushrooms/* gtk3-mushrooms/*
......
...@@ -2,13 +2,13 @@ ...@@ -2,13 +2,13 @@
# Maintainer: Tomasz Gąsior <tomaszgasior.pl> # Maintainer: Tomasz Gąsior <tomaszgasior.pl>
_repo=gtk3-mushrooms _repo=gtk3-mushrooms
__arch_pkg_commit=a97a4614dfdb3a2f0c97ed58f94385ecc9b16b1e __arch_pkg_commit=20100f065f461df74606b63ea2fd60f1ed114c8a
_pkgname=lib32-gtk3 _pkgname=lib32-gtk3
pkgname=$_pkgname-classic pkgname=$_pkgname-classic
pkgver=3.22.30 pkgver=3.24.1
pkgrel=5 pkgrel=2
pkgdesc="GTK3 patched for classic desktops like MATE/XFCE (see README)." pkgdesc="\"gtk3-mushrooms\"; GTK3 patched for classic desktops. 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
conflicts=($_pkgname) conflicts=($_pkgname)
...@@ -18,7 +18,7 @@ license=(LGPL) ...@@ -18,7 +18,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
...@@ -50,17 +50,11 @@ makedepends=( ...@@ -50,17 +50,11 @@ makedepends=(
source=( source=(
# GTK source code. # GTK source code.
"https://download.gnome.org/sources/gtk+/${pkgver%.*}/gtk+-$pkgver.tar.xz" "https://download.gnome.org/sources/gtk+/${pkgver%.*}/gtk+-$pkgver.tar.xz"
# 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"
) )
sha256sums=('a1a4a5c12703d4e1ccda28333b87ff462741dc365131fbc94c218ae81d9a6567' sha256sums=('SKIP'
'ceb95c0952ccd3ded84cd55a2386a33edac91597052b077d12fa4a3cc62a1612'
'68e3ea59140ee565a146fff2db2d2e2ed99536bbad8ba818bee124325d516e01'
'4ac8112ac7e6fa879756e1eeb89b5efa0825ba00e5b05469913b256f86a37608' '4ac8112ac7e6fa879756e1eeb89b5efa0825ba00e5b05469913b256f86a37608'
'SKIP') 'SKIP')
...@@ -93,17 +87,14 @@ __patch_makefiles() { ...@@ -93,17 +87,14 @@ __patch_makefiles() {
__patch_gtk_code() { __patch_gtk_code() {
for patch_file in $srcdir/$_repo/*.patch; do for patch_file in $srcdir/$_repo/*.patch; do
patch -d "gtk" -p3 -i "$patch_file" patch -p 2 -i "$patch_file"
done done
cat "$srcdir/$_repo/smaller-adwaita.css" | tee -a gtk/theme/Adwaita/gtk-contained{,-dark}.css > /dev/null cat "$srcdir/$_repo/smaller-adwaita.css" | tee -a gtk/theme/Adwaita/gtk-contained{,-dark}.css > /dev/null
} }
prepare() { prepare() {
cd gtk3-mushrooms cd "$srcdir/gtk+-$pkgver"
sed -i 's/9589/9598/g' other__hide-insert-emoji.patch
cd "../gtk+-$pkgver"
# 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,15 +102,11 @@ prepare() { ...@@ -111,15 +102,11 @@ 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.
patch -p 1 -i "$srcdir/upstream_transparent_window_bg_1._patch"
patch -p 1 -i "$srcdir/upstream_transparent_window_bg_2._patch"
NOCONFIGURE=1 ./autogen.sh NOCONFIGURE=1 ./autogen.sh
} }
build() { build() {
cd "gtk+-$pkgver" cd "$srcdir/gtk+-$pkgver"
export CC='gcc -m32' export CC='gcc -m32'
export CXX='/bin/false' export CXX='/bin/false'
...@@ -142,7 +129,7 @@ build() { ...@@ -142,7 +129,7 @@ build() {
} }
package() { package() {
cd "gtk+-$pkgver" cd "$srcdir/gtk+-$pkgver"
make DESTDIR="$pkgdir" install make DESTDIR="$pkgdir" install
......
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