summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO44
-rw-r--r--PKGBUILD66
2 files changed, 17 insertions, 93 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 0b60ae51632c..2b02fc6cc413 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = gtk4-git
pkgdesc = GObject-based multi-platform GUI toolkit (GIT Version)
- pkgver = 3.91.2.r462.g0740fb5c64
+ pkgver = 3.91.2.r136.g84bcf7d4d3
pkgrel = 1
url = http://www.gtk.org/
arch = i686
@@ -12,7 +12,8 @@ pkgbase = gtk4-git
makedepends = colord
makedepends = rest
makedepends = libcups
- makedepends = autoconf-archive
+ makedepends = meson
+ makedepends = ninja
depends = adwaita-icon-theme
depends = at-spi2-atk
depends = atk-git>=2.15.1
@@ -54,45 +55,6 @@ pkgbase = gtk4-git
sha512sums = 5cd50d93bb6bc203438a2a0764bd717409658e124058b18a1da26a21f10ef7564a16f32fc0633a68b45b2e303fa63a5efefeadd6b0bf1d7f474556df8cdb6c58
sha512sums = 1642d77622d61234e316e8fcbc803a6a5556c606e37e56aa5981ef2f2df85bfa959c31b5d1bff248b340760e1178281cb0d7abdf540c5f7d4b62cb383a67c685
-pkgname = gtk4-update-icon-cache-git
- pkgdesc = GTK+ icon cache updater
- depends = gdk-pixbuf2
- depends = hicolor-icon-theme
-
pkgname = gtk4-git
install = gtk4.install
- depends = adwaita-icon-theme
- depends = at-spi2-atk
- depends = atk-git>=2.15.1
- depends = cairo>=1.14.0
- depends = dconf
- depends = desktop-file-utils
- depends = glib2-git>=2.53.4
- depends = gdk-pixbuf2>=2.30.0
- depends = json-glib
- depends = libcups
- depends = libepoxy>=1.0
- depends = librsvg
- depends = libxcomposite
- depends = libxcursor
- depends = libxdamage
- depends = libxi
- depends = libxinerama
- depends = libxkbcommon
- depends = libxrandr
- depends = mesa
- depends = pango-git>=1.37.3
- depends = shared-mime-info
- depends = wayland-git>=1.9.91
- depends = wayland-protocols-git>=1.9
- depends = graphene>=1.5.1
- depends = gtk-update-icon-cache
-
-pkgname = gtk4-print-backends-git
- pkgdesc = Print backends for GTK4
- groups = gnome
- depends = gtk4-git
- depends = rest
- depends = colord
- depends = libcups
diff --git a/PKGBUILD b/PKGBUILD
index 2bfb72a6aae3..efd91234866a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,8 +1,8 @@
# Maintainer: Andrew Crerar <andrew (at) crerar (dot) io>
pkgbase=gtk4-git
-pkgname=(gtk4-update-icon-cache-git gtk4-git gtk4-print-backends-git)
-pkgver=3.91.2.r462.g0740fb5c64
+pkgname=(gtk4-git)
+pkgver=3.91.2.r136.g84bcf7d4d3
pkgrel=1
pkgdesc="GObject-based multi-platform GUI toolkit (GIT Version)"
arch=('i686' 'x86_64')
@@ -39,7 +39,8 @@ makedepends=('gobject-introspection-git'
'colord'
'rest'
'libcups'
- 'autoconf-archive')
+ 'meson'
+ 'ninja')
optdepends=('gnome-icon-theme: Default icon theme'
'gnome-themes-standard: Default widget theme')
backup=('usr/share/gtk-4.0/settings.ini')
@@ -59,72 +60,33 @@ sha512sums=('SKIP'
pkgver() {
cd gtk+
- printf "%s.r%s.g%s" "$(grep -m1 'gtk_major_version' configure.ac | sed -r 's/([^0-9]*([0-9]*)){2}.*/\2/').$(grep -m1 'gtk_minor_version' configure.ac | sed -r 's/([^0-9]*([0-9]*)){2}.*/\2/').$(grep -m1 'gtk_micro_version' configure.ac | sed -r 's/([^0-9]*([0-9]*)){2}.*/\2/')" \
+ printf "%s.r%s.g%s" "$(grep -m1 'version' meson.build | sed -r 's/([^0-9]*([0-9.]+)).*/\2/')" \
"$(git describe --tags --long | cut -d '-' -f 2)" \
"$(git rev-parse --short HEAD)"
}
-prepare() {
- cd gtk+
- NOCONFIGURE=1 ./autogen.sh
-}
-
build() {
cd gtk+
- CXX=/bin/false ./configure --prefix=/usr \
+ meson --prefix=/usr \
--sysconfdir=/etc \
--localstatedir=/var \
- --disable-schemas-compile \
- --enable-x11-backend \
- --enable-broadway-backend \
- --enable-wayland-backend \
- --disable-gtk-doc
+ -Denable-broadway-backend=true \
+ _build .
- # https://bugzilla.gnome.org/show_bug.cgi?id=655517
- sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
+ cd _build
- make
+ ninja
}
package_gtk4-git() {
- depends+=(gtk-update-icon-cache)
install="gtk4.install"
- cd gtk+
-
- make DESTDIR="$pkgdir" install
-
- install -Dm644 "../settings.ini" "$pkgdir/usr/share/gtk-4.0/settings.ini"
- install -Dm644 ../gtk4-query-immodules.hook "$pkgdir/usr/share/libalpm/hooks/gtk4-query-immodules.hook"
-
- rm "$pkgdir/usr/bin/gtk4-update-icon-cache"
+ cd gtk+/_build
- cd "$pkgdir"
- for _f in usr/lib/*/*/printbackends/*; do
- case $_f in
- *-file.so|*-lpr.so) continue;;
- esac
+ DESTDIR="$pkgdir" ninja install
- mkdir -p "$srcdir/print-backends/${_f%/*}"
- mv "$_f" "$srcdir/print-backends/$_f"
- done
+ install -Dm644 "../../settings.ini" "$pkgdir/usr/share/gtk-4.0/settings.ini"
+ install -Dm644 ../../gtk4-query-immodules.hook "$pkgdir/usr/share/libalpm/hooks/gtk4-query-immodules.hook"
}
-package_gtk4-update-icon-cache-git() {
- pkgdesc="GTK+ icon cache updater"
- depends=(gdk-pixbuf2 hicolor-icon-theme)
-
- cd gtk+
- install -D gtk/gtk4-update-icon-cache "$pkgdir/usr/bin/gtk4-update-icon-cache"
- install -Dm644 ../gtk4-update-icon-cache.hook "$pkgdir/usr/share/libalpm/hooks/gtk4-update-icon-cache.hook"
- install -D ../gtk4-update-icon-cache.script "$pkgdir/usr/share/libalpm/scripts/gtk4-update-icon-cache"
-}
-
-package_gtk4-print-backends-git() {
- pkgdesc="Print backends for GTK4"
- depends=(gtk4-git rest colord libcups)
- groups=(gnome)
-
- mv print-backends/* "$pkgdir"
-}