[arch-commits] Commit in lib32-glib2/trunk (3 files)

2018-10-03 Thread Jan Steffens via arch-commits 
Date: Wednesday, October 3, 2018 @ 23:16:25
  Author: heftig
Revision: 389314

2.58.1-1

Modified:
  lib32-glib2/trunk/PKGBUILD
Deleted:
  lib32-glib2/trunk/0001-meson-Fix-libmount-support.patch
  lib32-glib2/trunk/libs.diff

---+
 0001-meson-Fix-libmount-support.patch |   41 ---
 PKGBUILD  |   39 ---
 libs.diff |  110 
 3 files changed, 14 insertions(+), 176 deletions(-)

Deleted: 0001-meson-Fix-libmount-support.patch
===
--- 0001-meson-Fix-libmount-support.patch   2018-10-03 22:51:31 UTC (rev 
389313)
+++ 0001-meson-Fix-libmount-support.patch   2018-10-03 23:16:25 UTC (rev 
389314)
@@ -1,41 +0,0 @@
-From c93756c8f066a1e35fa2f46b231771d78e292600 Mon Sep 17 00:00:00 2001
-Message-Id: 

-From: "Jan Alexander Steffens (heftig)" 
-Date: Tue, 31 Oct 2017 04:11:42 +0100
-Subject: [PATCH] meson: Fix libmount support
-
-The define was still missing.

- config.h.meson | 3 +++
- meson.build| 1 +
- 2 files changed, 4 insertions(+)
-
-diff --git a/config.h.meson b/config.h.meson
-index c67e1792f4af1ada..3f310b3c960fcb29 100644
 a/config.h.meson
-+++ b/config.h.meson
-@@ -247,6 +247,9 @@
- /* Define if libelf is available */
- #mesondefine HAVE_LIBELF
- 
-+/* Define if libmount is available */
-+#mesondefine HAVE_LIBMOUNT
-+
- /* Define to 1 if you have the  header file. */
- #mesondefine HAVE_LINUX_MAGIC_H
- 
-diff --git a/meson.build b/meson.build
-index 208c23087627de1e..cd9cbf2ce10595c2 100644
 a/meson.build
-+++ b/meson.build
-@@ -1535,6 +1535,7 @@ if use_system_pcre
- endif
- if libmount_dep.length() == 1 and libmount_dep[0].found()
-   glib_conf.set('LIBMOUNT_LIBS', '-lmount')
-+  glib_conf.set('HAVE_LIBMOUNT', 1)
- endif
- glib_conf.set('GIO_MODULE_DIR', '${libdir}/gio/modules')
- # FIXME: Missing:
--- 
-2.15.0
-

Modified: PKGBUILD
===
--- PKGBUILD2018-10-03 22:51:31 UTC (rev 389313)
+++ PKGBUILD2018-10-03 23:16:25 UTC (rev 389314)
@@ -3,7 +3,7 @@
 # Contributor: Mikko Seppälä 
 
 pkgname=lib32-glib2
-pkgver=2.56.2
+pkgver=2.58.1
 pkgrel=1
 pkgdesc="Low level core library (32-bit)"
 url="https://wiki.gnome.org/Projects/GLib;
@@ -10,10 +10,10 @@
 license=(LGPL2.1)
 arch=(x86_64)
 depends=(lib32-pcre lib32-libffi lib32-util-linux lib32-zlib glib2)
-makedepends=(gettext gtk-doc shared-mime-info python lib32-libelf git 
util-linux lib32-dbus)
+makedepends=(gettext gtk-doc shared-mime-info python lib32-libelf git 
util-linux meson lib32-dbus)
 checkdepends=(desktop-file-utils lib32-glib2)
 options=(!emptydirs)
-_commit=d4b60396c79c7294ab69a2c591518e76ab17b603  # tags/2.56.2^0
+_commit=a9f5a6fa2fdd6eb2f754709d7e790d24e3ceaa18  # tags/2.58.1^0
 source=("git+https://gitlab.gnome.org/GNOME/glib.git#commit=$_commit;
 gio-querymodules-32.hook)
 sha256sums=('SKIP'
@@ -26,42 +26,31 @@
 
 prepare() {
   cd glib
-
-  NOCONFIGURE=1 ./autogen.sh
 }
 
 build() {
-  local debug=minimum
-  check_option debug n && debug=yes
-
   export CC="gcc -m32"
   export CXX="g++ -m32"
   export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
 
-  cd glib
-  ./configure \
---prefix=/usr \
---libdir=/usr/lib32 \
---sysconfdir=/etc \
---with-pcre=system \
---enable-debug=$debug \
---disable-gtk-doc \
---disable-fam
-  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
-  make
+  arch-meson glib build \
+-D selinux=false \
+--libdir=/usr/lib32
+  ninja -C build
 }
 
 check() {
-  cd glib
-  make check
+  meson test -C build -t 2
 }
 
 package() {
-  cd glib
-  make DESTDIR="$pkgdir" install
+  DESTDIR="$pkgdir" meson install -C build
+
   rm -r "$pkgdir"/usr/{share,include}
-  find "$pkgdir/usr/bin" -type f -not -name gio-querymodules -delete
+  find "$pkgdir/usr/bin" -type f -not -name gio-querymodules -printf 'Removing 
%P\n' -delete
   mv "$pkgdir"/usr/bin/gio-querymodules{,-32}
 
-  install -Dt "$pkgdir/usr/share/libalpm/hooks" -m644 ../*.hook
+  install -Dt "$pkgdir/usr/share/libalpm/hooks" -m644 *.hook
 }
+
+# vim:set sw=2 et:

Deleted: libs.diff
===
--- libs.diff   2018-10-03 22:51:31 UTC (rev 389313)
+++ libs.diff   2018-10-03 23:16:25 UTC (rev 389314)
@@ -1,110 +0,0 @@
-diff --git i/gio/meson.build w/gio/meson.build
-index 4a10d49d7eb3229c..77537a77a26dcb5b 100644
 i/gio/meson.build
-+++ w/gio/meson.build
-@@ -741,7 +741,7 @@ libgio = shared_library('gio-2.0',
-   libgobject_dep, libgmodule_dep] + platform_deps + 
network_libs,
-   c_args : gio_c_args,
-   # intl.lib is not compatible with SAFESEH
--  link_args : noseh_link_args,
-+  link_args : noseh_link_args + library_link_args,
- )
- 
- libgio_dep = declare_dependency(link_with : libgio,
-diff --git i/glib/meson.build w/glib/meson.build
-index

[arch-commits] Commit in lib32-glib2/trunk (3 files)

2017-10-30 Thread Jan Steffens 
Date: Tuesday, October 31, 2017 @ 03:27:23
  Author: heftig
Revision: 264834

2.54.2-2

Added:
  lib32-glib2/trunk/0001-meson-Fix-libmount-support.patch
  lib32-glib2/trunk/libs.diff
Modified:
  lib32-glib2/trunk/PKGBUILD

---+
 0001-meson-Fix-libmount-support.patch |   41 +++
 PKGBUILD  |   54 +--
 libs.diff |  110 
 3 files changed, 183 insertions(+), 22 deletions(-)

Added: 0001-meson-Fix-libmount-support.patch
===
--- 0001-meson-Fix-libmount-support.patch   (rev 0)
+++ 0001-meson-Fix-libmount-support.patch   2017-10-31 03:27:23 UTC (rev 
264834)
@@ -0,0 +1,41 @@
+From c93756c8f066a1e35fa2f46b231771d78e292600 Mon Sep 17 00:00:00 2001
+Message-Id: 

+From: "Jan Alexander Steffens (heftig)" 
+Date: Tue, 31 Oct 2017 04:11:42 +0100
+Subject: [PATCH] meson: Fix libmount support
+
+The define was still missing.
+---
+ config.h.meson | 3 +++
+ meson.build| 1 +
+ 2 files changed, 4 insertions(+)
+
+diff --git a/config.h.meson b/config.h.meson
+index c67e1792f4af1ada..3f310b3c960fcb29 100644
+--- a/config.h.meson
 b/config.h.meson
+@@ -247,6 +247,9 @@
+ /* Define if libelf is available */
+ #mesondefine HAVE_LIBELF
+ 
++/* Define if libmount is available */
++#mesondefine HAVE_LIBMOUNT
++
+ /* Define to 1 if you have the  header file. */
+ #mesondefine HAVE_LINUX_MAGIC_H
+ 
+diff --git a/meson.build b/meson.build
+index 208c23087627de1e..cd9cbf2ce10595c2 100644
+--- a/meson.build
 b/meson.build
+@@ -1535,6 +1535,7 @@ if use_system_pcre
+ endif
+ if libmount_dep.length() == 1 and libmount_dep[0].found()
+   glib_conf.set('LIBMOUNT_LIBS', '-lmount')
++  glib_conf.set('HAVE_LIBMOUNT', 1)
+ endif
+ glib_conf.set('GIO_MODULE_DIR', '${libdir}/gio/modules')
+ # FIXME: Missing:
+-- 
+2.15.0
+

Modified: PKGBUILD
===
--- PKGBUILD2017-10-31 02:45:51 UTC (rev 264833)
+++ PKGBUILD2017-10-31 03:27:23 UTC (rev 264834)
@@ -5,18 +5,24 @@
 
 _pkgbasename=glib2
 pkgname=lib32-$_pkgbasename
-pkgver=2.52.2+9+g3245eba16
-pkgrel=1
+pkgver=2.54.2
+pkgrel=2
 pkgdesc="Low level core library (32-bit)"
-url="http://www.gtk.org/;
+url="https://wiki.gnome.org/Projects/GLib;
+license=(LGPL2.1)
 arch=(x86_64)
-license=(LGPL)
-depends=(lib32-dbus lib32-libffi lib32-pcre lib32-util-linux lib32-libelf 
"$_pkgbasename")
-makedepends=(gcc-multilib python git)
-_commit=3245eba169c439180cc13ed3c76f47298d723031  # glib-2-52
+depends=(lib32-pcre lib32-libffi lib32-util-linux lib32-zlib "$_pkgbasename")
+makedepends=(gettext gcc-multilib shared-mime-info python lib32-libelf git 
util-linux meson lib32-dbus)
+checkdepends=(desktop-file-utils)
+options=(!emptydirs)
+_commit=52b3e434d849e2b0233d6d3d663b5dda82ab263e  # tags/2.54.2^0
 source=("git+https://git.gnome.org/browse/glib#commit=$_commit;
+0001-meson-Fix-libmount-support.patch
+libs.diff
 gio-querymodules-32.hook)
 sha256sums=('SKIP'
+'14c0dcfb4efb690f7cb44673faf31f5eb40ac68c01974eddb53d5aa7ae366629'
+'2fb828f51727bd9c8b48cfd9d6833c8b4ff82803331f6e2340b0ec8edfe57c52'
 '73b6791b58180e2a02fe908938e6c547ee1b263f8c387262f9a8c4105ffa999a')
 
 pkgver() {
@@ -25,8 +31,14 @@
 }
 
 prepare() {
+  mkdir -p build
   cd glib
-  NOCONFIGURE=1 ./autogen.sh
+
+  # https://bugzilla.gnome.org/show_bug.cgi?id=789681
+  patch -Np1 -i ../0001-meson-Fix-libmount-support.patch
+
+  # https://bugzilla.gnome.org/show_bug.cgi?id=788773
+  patch -Np1 -i ../libs.diff
 }
 
 build() {
@@ -34,20 +46,20 @@
   export CXX="g++ -m32"
   export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
 
-  cd glib
-  ./configure --prefix=/usr --libdir=/usr/lib32 \
-  --sysconfdir=/etc \
-  --with-pcre=system \
-  --disable-fam \
-  --disable-gtk-doc \
-  $(check_option debug y && echo --enable-debug=yes)
-  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
-  make
+  cd build
+  arch-meson ../glib --libdir=/usr/lib32 \
+-Dwith-docs=no -Dwith-man=no
+  ninja
 }
 
+check() {
+  cd build
+  meson test -t 2
+}
+
 package() {
-  cd glib
-  make DESTDIR="$pkgdir" install
+  cd build
+  DESTDIR="$pkgdir" ninja install
 
   rm -r "$pkgdir"/usr/{share,include}
   find "$pkgdir/usr/bin" -type f -not -name gio-querymodules -delete
@@ -55,7 +67,5 @@
   mv "$pkgdir"/usr/bin/gio-querymodules{,-32}
 
   # install hooks
-  install -d "$pkgdir/usr/share/libalpm/hooks/"
-  install -m644 "$srcdir"/gio-querymodules-32.hook \
-"$pkgdir/usr/share/libalpm/hooks/"
+  install -Dt "$pkgdir/usr/share/libalpm/hooks" -m644 ../*.hook
 }

Added: libs.diff
===
--- libs.diff

[arch-commits] Commit in lib32-glib2/trunk (3 files)

2017-06-03 Thread Jan Steffens 
Date: Saturday, June 3, 2017 @ 10:54:53
  Author: heftig
Revision: 233694

2.52.2+9+g3245eba16-1

Modified:
  lib32-glib2/trunk/PKGBUILD
  lib32-glib2/trunk/gio-querymodules-32.hook
Deleted:
  lib32-glib2/trunk/revert-warn-glib-compile-schemas.patch

+
 PKGBUILD   |   48 ++-
 gio-querymodules-32.hook   |2 -
 revert-warn-glib-compile-schemas.patch |   33 -
 3 files changed, 24 insertions(+), 59 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-06-03 10:51:38 UTC (rev 233693)
+++ PKGBUILD2017-06-03 10:54:53 UTC (rev 233694)
@@ -1,26 +1,23 @@
 # $Id$
-# Maintainer:  Ionut Biru 
+# Contributor: Ionut Biru 
 # Contributor: Pierre Schmitz 
 # Contributor: Mikko Seppälä 
 
 _pkgbasename=glib2
 pkgname=lib32-$_pkgbasename
-pkgver=2.50.1
-pkgrel=2
-pkgdesc="Common C routines used by GTK+ 2.4 and other libs (32-bit)"
+pkgver=2.52.2+9+g3245eba16
+pkgrel=1
+pkgdesc="Low level core library (32-bit)"
 url="http://www.gtk.org/;
-arch=('x86_64')
-license=('LGPL')
+arch=(x86_64)
+license=(LGPL)
 depends=(lib32-dbus lib32-libffi lib32-pcre lib32-util-linux lib32-libelf 
"$_pkgbasename")
-makedepends=('gcc-multilib' 'python' 'git')
-_commit=e44ea516afeb41d22cebf968b3ea5d9543856df2 # tags/2.50.1^0
-#options=('!docs')
-source=("git://git.gnome.org/glib#commit=$_commit"
-gio-querymodules-32.hook
-revert-warn-glib-compile-schemas.patch)
+makedepends=(gcc-multilib python git)
+_commit=3245eba169c439180cc13ed3c76f47298d723031  # glib-2-52
+source=("git+https://git.gnome.org/browse/glib#commit=$_commit;
+gio-querymodules-32.hook)
 sha256sums=('SKIP'
-'e36da43ac0f705860646d4aecf66f82030bb0926814b5d4ec4e3284f24fecc36'
-'049240975cd2f1c88fbe7deb28af14d4ec7d2640495f7ca8980d873bb710cc97')
+'73b6791b58180e2a02fe908938e6c547ee1b263f8c387262f9a8c4105ffa999a')
 
 pkgver() {
   cd glib
@@ -29,7 +26,6 @@
 
 prepare() {
   cd glib
-  patch -Rp1 -i ../revert-warn-glib-compile-schemas.patch
   NOCONFIGURE=1 ./autogen.sh
 }
 
@@ -39,8 +35,12 @@
   export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
 
   cd glib
-  ./configure --prefix=/usr --sysconfdir=/etc \
-  --libdir=/usr/lib32 --with-pcre=system --disable-fam
+  ./configure --prefix=/usr --libdir=/usr/lib32 \
+  --sysconfdir=/etc \
+  --with-pcre=system \
+  --disable-fam \
+  --disable-gtk-doc \
+  $(check_option debug y && echo --enable-debug=yes)
   sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
   make
 }
@@ -47,16 +47,14 @@
 
 package() {
   cd glib
-  make DESTDIR="${pkgdir}" install
-  rm -rf "${pkgdir}"/{etc,usr/{share,include}}
+  make DESTDIR="$pkgdir" install
 
-  cd "${pkgdir}"/usr/bin
-  mv gio-querymodules gio-querymodules-32
-  rm -f gdbus glib* gobject-query gsettings gtester*
-  rm -rf "$pkgdir"/usr/lib32/gdbus-2.0
-  find "$pkgdir/usr/bin" -type f -not -name gio-querymodules-32 -delete
+  rm -r "$pkgdir"/usr/{share,include}
+  find "$pkgdir/usr/bin" -type f -not -name gio-querymodules -delete
 
-  # install hook
+  mv "$pkgdir"/usr/bin/gio-querymodules{,-32}
+
+  # install hooks
   install -d "$pkgdir/usr/share/libalpm/hooks/"
   install -m644 "$srcdir"/gio-querymodules-32.hook \
 "$pkgdir/usr/share/libalpm/hooks/"

Modified: gio-querymodules-32.hook
===
--- gio-querymodules-32.hook2017-06-03 10:51:38 UTC (rev 233693)
+++ gio-querymodules-32.hook2017-06-03 10:54:53 UTC (rev 233694)
@@ -6,6 +6,6 @@
 Target = usr/lib32/gio/modules/*.so
 
 [Action]
-Description = Updating GIO module cache...
+Description = Updating 32-bit GIO module cache...
 When = PostTransaction
 Exec = /usr/bin/gio-querymodules-32 /usr/lib32/gio/modules

Deleted: revert-warn-glib-compile-schemas.patch
===
--- revert-warn-glib-compile-schemas.patch  2017-06-03 10:51:38 UTC (rev 
233693)
+++ revert-warn-glib-compile-schemas.patch  2017-06-03 10:54:53 UTC (rev 
233694)
@@ -1,33 +0,0 @@
-From 6560b37450cd19c4a7c7b690e279fe97b7bfdcaa Mon Sep 17 00:00:00 2001
-From: Ryan Lortie 
-Date: Thu, 12 Apr 2012 23:55:34 +
-Subject: glib-compile-schemas: warn about bad dconf paths
-
-For quite some time the recommended usage of GSettings and dconf has
-been to use paths like /org/gnome/example/.  Use of /apps/ has spilled
-over from GConf and is continuing to make its way into a number of
-applications as they port.
-
-glib-compile-schemas will now warn about these types of paths being
-used.  This generates a lot of noise, but hopefully it will reduce the
-number of ported applications making this mistake.

-diff --git a/gio/glib-compile-schemas.c b/gio/glib-compile-schemas.c