upg glib2

glib2/PKGBUILD

@@ -8,17 +8,22 @@
 #pkgbase=glib2
 #pkgname=(glib2 glib2-docs)
 pkgname=glib2
-pkgver=2.78.4
-pkgrel=01
+pkgver=2.80.0
+pkgrel=02
 pkgdesc="Low level core library"
 #url="https://wiki.gnome.org/Projects/GLib"
 url="https://gitlab.gnome.org/GNOME/glib"
 depends=(libffi pcre2 util-linux-libs zlib) # libsysprof-capture 
-makedepends=(gettext git libelf meson python shared-mime-info util-linux libxslt) #libsysprof-capture
+makedepends=(gettext git 
+#  gi-docgen
+  gobject-introspection
+#  python-docutils
+  python-packaging
+libelf meson python shared-mime-info util-linux libxslt) #libsysprof-capture
 checkdepends=(desktop-file-utils glib2)
 #options=(debug staticlibs)  ###  uncomment this to have the debug pkg produced
 options=(staticlibs)
-_commit=00edb7f7453a43cff343f9e99d49f2e421e4345c  # tags/2.78.4^0
+_commit=763cc3b238398614c20069fd67642730e3a6519b  # tags/2.80.0^0
  source=("git+https://gitlab.gnome.org/GNOME/glib.git#commit=$_commit"
   "git+https://gitlab.gnome.org/GNOME/gvdb.git"
   0001-glib-compile-schemas-Remove-noisy-deprecation-warnin.patch
@@ -56,8 +61,9 @@ build() {
     -D glib_debug=disabled \
     -D selinux=disabled \
     -D sysprof=disabled \
-    -D man=true \
-    -D gtk_doc=false
+    -D documentation=false \
+    -D introspection=enabled \
+    -D man-pages=enabled
 
   meson compile -C build
 }
@@ -74,9 +80,11 @@ build() {
 package() {
   depends+=(libmount.so libffi.so)
 
-  provides+=(libg{lib,io,module,object,thread}-2.0.so)
+  provides+=(libg{lib,io,irepository,module,object,thread}-2.0.so)
+
   optdepends=('python: gdbus-codegen, glib-genmarshal, glib-mkenums, gtester-report'
-              'libelf: gresource inspection tool')
+	'libelf: gresource inspection tool'
+	'python-packaging: gdbus-codegen')
 
   meson install -C build --destdir "$pkgdir"
 
@@ -93,7 +101,8 @@ package() {
 # building it.  The following is to split the gtk-doc part into a separate pkg.
 #  # Split docs
 #  mkdir -p docs/usr/share
-#  mv {"$pkgdir",docs}/usr/share/gtk-doc
+#  mv {"$pkgdir",docs}/usr/share/doc
+#
 }
 
 #package_glib2-docs() {
@@ -117,6 +126,6 @@ sha256sums=(SKIP # glib
 	7f8ee5db60987f0d0feba84643e1cf988c98a294a681fb8d4fce1a5b2c25d1d3  # 0001-glib-compile-schemas-Remove-noisy-deprecation-warnin.patch
 	557c88177f011ced17bdeac1af3f882b2ca33b386a866fdf900b35f927a2bbe8  # gio-querymodules.hook
 	64ae5597dda3cc160fc74be038dbe6267d41b525c0c35da9125fbf0de27f9b25) # glib-compile-schemas.hook
-#	06cfa9a2549c408abb6c0f699cba5e94e81e5235f934a68f03d43f88263cb19f) # docbook.xsl
 
-##  853acb903ca87b4f03306df5779481f4d430ed9d256381474238337c2e1a59ef  glib2-2.78.4-01-x86_64.pkg.tar.lz
+##  01ecf268ea1bc5de8e0db0a020e040084cdd0035e1b8f62116194f9fedf09730  glib2-2.80.0-02-x86_64.pkg.tar.lz
+

glib2/PKGBUILD-arch

@@ -7,8 +7,8 @@ pkgname=(
   glib2
   glib2-docs
 )
-pkgver=2.78.4
-pkgrel=1
+pkgver=2.80.0
+pkgrel=2
 pkgdesc="Low level core library"
 url="https://gitlab.gnome.org/GNOME/glib"
 license=(LGPL-2.1-or-later)
@@ -24,10 +24,13 @@ makedepends=(
   dbus
   gettext
   git
-  gtk-doc
+  gi-docgen
+  gobject-introspection
   libelf
   meson
   python
+  python-docutils
+  python-packaging
   shared-mime-info
   util-linux
 )
@@ -39,7 +42,7 @@ options=(
   debug
   staticlibs
 )
-_commit=00edb7f7453a43cff343f9e99d49f2e421e4345c  # tags/2.78.4^0
+_commit=763cc3b238398614c20069fd67642730e3a6519b  # tags/2.80.0^0
 source=(
   "git+https://gitlab.gnome.org/GNOME/glib.git#commit=$_commit"
   "git+https://gitlab.gnome.org/GNOME/gvdb.git"
@@ -47,7 +50,7 @@ source=(
   gio-querymodules.hook
   glib-compile-schemas.hook
 )
-b2sums=('SKIP'
+b2sums=('cc3a6a7a14fef1aabc08d3bdfe98f66e3ecf3591ac054d83aa9404c8c9cd72e690a4c26c16934700d067bb2cb3d58730387482032cd9ffa04b041869426165ba'
         'SKIP'
         '94c73ca7070c239494873dd52d6ee09382bbb5b1201f7afd737cfa140b1a2fb0744b2c2831baf3943d1d072550c35888d21ce6f19f89481ff9d1a60d9a0b30e0'
         '14c9211c0557f6d8d9a914f1b18b7e0e23f79f4abde117cb03ab119b95bf9fa9d7a712aa0a29beb266468aeb352caa3a9e4540503cfc9fe0bbaf764371832a96'
@@ -74,8 +77,9 @@ build() {
   local meson_options=(
     --default-library both
     -D glib_debug=disabled
-    -D gtk_doc=true
-    -D man=true
+    -D documentation=true
+    -D introspection=enabled
+    -D man-pages=enabled
     -D selinux=disabled
     -D sysprof=enabled
   )
@@ -101,11 +105,12 @@ package_glib2() {
     libffi.so
     libmount.so
   )
-  provides+=(libg{lib,io,module,object,thread}-2.0.so)
+  provides+=(libg{lib,io,irepository,module,object,thread}-2.0.so)
   optdepends=(
     'gvfs: most gio functionality'
     'libelf: gresource inspection tool'
     'python: gdbus-codegen, glib-genmarshal, glib-mkenums, gtester-report'
+    'python-packaging: gdbus-codegen'
   )
 
   meson install -C build --destdir "$pkgdir"
@@ -120,7 +125,7 @@ package_glib2() {
 
   # Split docs
   mkdir -p docs/usr/share
-  mv {"$pkgdir",docs}/usr/share/gtk-doc
+  mv {"$pkgdir",docs}/usr/share/doc
 }
 
 package_glib2-docs() {

glib2/deps

@@ -4,5 +4,8 @@ meson
 python
 shared-mime-info
 libxslt
-gtk-doc
+gobject-introspection
+python-packaging
+python-docutils
+