fix gtk3

3 files changed, 30 insertions, 80 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 6ca994867a81..b62d14c41719 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,15 +1,17 @@
 pkgbase = gtk3-git
 	pkgdesc = GObject-based multi-platform GUI toolkit (GIT Version)
-	pkgver = 3.24.41.r1.g40fe0985
+	pkgver = 3.24.41.r22.gc4dd8d0125
 	pkgrel = 1
 	url = http://www.gtk.org/
-	arch = i686
 	arch = x86_64
-	arch = arm
-	arch = armv7h
-	arch = aarch64
-	license = LGPL-2.0-Only
+	license = LGPL-2.0-only
 	makedepends = gobject-introspection
+	makedepends = git
+	makedepends = meson
+	makedepends = libxslt
+	makedepends = glib2-docs
+	makedepends = sassc
+	makedepends = docbook-xsl
 	depends = at-spi2-atk
 	depends = atk
 	depends = cairo
@@ -29,13 +31,11 @@ pkgbase = gtk3-git
 	depends = shared-mime-info
 	depends = wayland
 	depends = wayland-protocols
+	depends = iso-codes
+	depends = tracker3
+	depends = libcloudproviders
 	optdepends = gnome-icon-theme: Default icon theme
 	optdepends = gnome-themes-standard: Default widget theme
-	provides = gtk3=3.24.41.r1.g40fe0985
-	provides = gtk3-print-backends
-	provides = libgtk-3.so
-	provides = libgdk-3.so
-	provides = libgailutil-3.so
 	conflicts = gtk3
 	backup = usr/share/gtk-3.0/settings.ini
 	source = git+https://gitlab.gnome.org/GNOME/gtk.git#branch=gtk-3-24
@@ -66,6 +66,9 @@ pkgname = gtk3-git
 	depends = shared-mime-info
 	depends = wayland
 	depends = wayland-protocols
+	depends = iso-codes
+	depends = tracker3
+	depends = libcloudproviders
 	depends = gtk-update-icon-cache
 	optdepends = evince: Default print preview command
 	provides = gtk3-print-backends
@@ -77,7 +80,7 @@ pkgname = gtk3-git
 
 pkgname = gtk3-demos-git
 	pkgdesc = GObject-based multi-platform GUI toolkit (GIT Version) (demo applications)
-	depends = gtk3
+	depends = gtk3-git
 
 pkgname = gtk3-docs-git
 	pkgdesc = GObject-based multi-platform GUI toolkit (GIT Version) (documentation)
diff --git a/PKGBUILD b/PKGBUILD
index 9dcd34b8e4f5..82a9b087e6b5 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -15,19 +15,13 @@ pkgname=(
   "${_pkgbase}-demos-git"
   "${_pkgbase}-docs-git"
 )
-pkgver=3.24.41.r1.g40fe0985
+pkgver=3.24.41.r22.gc4dd8d0125
 pkgrel=1
 pkgdesc="GObject-based multi-platform GUI toolkit (GIT Version)"
-arch=(
-  'i686'
-  'x86_64'
-  'arm'
-  'armv7h'
-  'aarch64'
-)
+arch=($CARCH)
 url="http://www.${_pkg}.org/"
 license=(
-  'LGPL-2.0-Only')
+  'LGPL-2.0-only')
 depends=(
   'at-spi2-atk'
   'atk'
@@ -48,19 +42,16 @@ depends=(
   'shared-mime-info'
   'wayland'
   'wayland-protocols'
+  'iso-codes'
+  'tracker3'
+  'libcloudproviders'
 )
 makedepends=(
-  'gobject-introspection')
+  'gobject-introspection' 'git' 'meson' 'libxslt' 'glib2-docs' 'sassc' 'docbook-xsl')
 optdepends=(
   "${_project}-icon-theme: Default icon theme"
   "${_project}-themes-standard: Default widget theme")
-conflicts=('gtk3' )
-provides=(
-  "${_pkgbase}=${pkgver}"
-  "${_pkgbase}-print-backends"
-  "lib${_pkg}-3.so"
-  "libgdk-3.so"
-  "libgailutil-3.so")
+conflicts=('gtk3')
 backup=("usr/share/${_pkg}-3.0/settings.ini")
 _http="https://gitlab.${_project}.org"
 _ns="GNOME"
@@ -108,24 +99,6 @@ build() {
     -C build
 }
 
-# build() {
-#   cd "${_pkg}"
-# 
-#   ./autogen.sh --disable-schemas-compile \
-#                --enable-broadway-backend \
-#                --enable-gtk2-dependency \
-#                --enable-wayland-backend \
-#                --enable-x11-backend \
-#                --localstatedir=/var \
-#                --prefix=/usr \
-#                --sysconfdir=/etc
-# 
-#   # https://bugzilla.gnome.org/show_bug.cgi?id=655517
-#   sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
-# 
-#   make
-# }
-
 _pick() {
   local p="$1" f d; shift
   for f; do
@@ -186,21 +159,11 @@ END
   cd \
     "${pkgdir}"
 
-  _pick \
-    demo \
-    "usr/bin/${_pkgbase}-"{demo,demo-application,icon-browser,widget-factory}
-  _pick \
-    demo \
-    "usr/share/applications/${_pkgbase}-"{demo,icon-browser,widget-factory}".desktop"
-  _pick \
-    demo \
-    "usr/share/glib-2.0/schemas/org.${_pkg}."{Demo,exampleapp}".gschema.xml"
-  _pick \
-    demo \
-    "usr/share/icons/hicolor/"*"/apps/${_pkgbase}-"{demo,widget-factory}[-.]*
-  _pick \
-    demo 
-    "usr/share/man/man1/${_pkgbase}-"{demo,demo-application,icon-browser,widget-factory}.1
+  _pick demo "usr/bin/${_pkgbase}-"{demo,demo-application,icon-browser,widget-factory}
+  _pick demo "usr/share/applications/${_pkgbase}-"{demo,icon-browser,widget-factory}".desktop"
+  _pick demo "usr/share/glib-2.0/schemas/org.${_pkg}."{Demo,exampleapp}".gschema.xml"
+  _pick demo "usr/share/icons/hicolor/"*"/apps/${_pkgbase}-"{demo,widget-factory}[-.]*
+  _pick demo "usr/share/man/man1/${_pkgbase}-"{demo,demo-application,icon-browser,widget-factory}.1
 
   if [[ " ${_meson_options[*]} " =~ " gtk_doc=true "  ]]; then
     _pick \
@@ -217,8 +180,7 @@ END
 
 package_gtk3-demos-git() {
   pkgdesc+=" (demo applications)"
-  depends=(
-    "${_pkgbase}")
+  depends=(gtk3-git)
   mv \
     demo/* \
     "${pkgdir}"
diff --git a/gtk3-git.install b/gtk3-git.install
index f57b1bffaa96..1c32bfe9421b 100644
--- a/gtk3-git.install
+++ b/gtk3-git.install
@@ -1,18 +1,3 @@
-post_install() {
-    /usr/bin/gtk-query-immodules-3.0 --update-cache
-    /usr/bin/glib-compile-schemas /usr/share/glib-2.0/schemas
-    /usr/bin/gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
-}
-
-post_upgrade() {
-    post_install
-}
-
 pre_remove() {
-    rm -f /usr/lib/gtk-3.0/3.0.0/immodules.cache
-}
-
-post_remove() {
-    /usr/bin/glib-compile-schemas /usr/share/glib-2.0/schemas
-    /usr/bin/gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
+	rm -f /usr/lib/gtk-3.0/3.0.0/immodule.cache
 }