Rework package based on gconf

4 files changed, 63 insertions, 65 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 53bc03299b2e..a71561f65f2b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,24 +1,26 @@
 pkgbase = lib32-gconf
-	pkgdesc = A configuration database system
-	pkgver = 3.2.6
-	pkgrel = 1
-	url = http://www.gnome.org
+	pkgdesc = An obsolete configuration database system
+	pkgver = 3.2.6+11+g07808097
+	pkgrel = 6
+	url = https://projects-old.gnome.org/gconf/
 	install = gconf.install
 	arch = x86_64
 	license = LGPL
-	makedepends = gcc-multilib
-	makedepends = gobject-introspection
 	makedepends = intltool
-	makedepends = python2
+	makedepends = gtk-doc
+	makedepends = gobject-introspection
+	makedepends = git
+	makedepends = gnome-common
+	makedepends = gcc-multilib
 	depends = gconf
 	depends = lib32-dbus-glib
 	depends = lib32-gtk3
-	source = http://ftp.gnome.org/pub/gnome/sources/GConf/3.2/GConf-3.2.6.tar.xz
-	source = gconf-reload.patch
+	source = lib32-gconf::git+https://gitlab.gnome.org/Archive/gconf.git#commit=0780809731c8ab1c364202b1900d3df106b28626
 	source = 01_xml-gettext-domain.patch
-	sha256sums = 1912b91803ab09a5eed34d364bf09fe3a2a9c96751fde03a4e0cfa51a04d784c
-	sha256sums = 567b78d8b4b4bbcb77c5f134d57bc503c34867fcc6341c0b01716bcaa4a21694
+	source = gconf-reload.patch
+	sha256sums = SKIP
 	sha256sums = c883dec2b96978874a53700cfe7f26f24f8296767203e970bc6402b4b9945eb8
+	sha256sums = 567b78d8b4b4bbcb77c5f134d57bc503c34867fcc6341c0b01716bcaa4a21694
 
 pkgname = lib32-gconf
 
diff --git a/MKPKG b/MKPKG
deleted file mode 100644
index a809c32d6ce2..000000000000
--- a/MKPKG
+++ /dev/null
@@ -1,8 +0,0 @@
-pkgname=('lib32-gconf')
-builddeps=('lib32-at-spi2-core' 'lib32-at-spi2-atk' 'lib32-dbus-glib'
-           'lib32-dconf' 'lib32-libgusb' 'lib32-js17' 'lib32-cracklib'
-           'lib32-libtirpc' 'lib32-pam' 'lib32-polkit' 'lib32-colord'
-           'lib32-json-glib' 'lib32-libproxy' 'lib32-glib-networking'
-           'lib32-libsoup' 'lib32-rest' 'lib32-libxkbcommon' 'lib32-gtk3')
-
-# vim: ts=2 sw=2 et:
diff --git a/PKGBUILD b/PKGBUILD
index fb4e37e4246e..c8e58d9420e6 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,58 +1,73 @@
-# Maintainer: Maxime Gauduin <alucryd@archlinux.org>
-# Contributor: josephgbr <rafael.f.f1@gmail.com>
+# Maintainer: Tim Schumacher <timschumi@gmx.de>
+# Contributor: Jan de Groot <jan@archlinux.org>
 
 pkgname=lib32-gconf
-pkgver=3.2.6
-pkgrel=1
-pkgdesc='A configuration database system'
-arch=('x86_64')
-license=('LGPL')
-url='http://www.gnome.org'
-depends=('gconf' 'lib32-dbus-glib' 'lib32-gtk3')
-makedepends=('gcc-multilib' 'gobject-introspection' 'intltool' 'python2')
-install='gconf.install'
-source=("http://ftp.gnome.org/pub/gnome/sources/GConf/3.2/GConf-${pkgver}.tar.xz"
-        'gconf-reload.patch'
-        '01_xml-gettext-domain.patch')
-sha256sums=('1912b91803ab09a5eed34d364bf09fe3a2a9c96751fde03a4e0cfa51a04d784c'
-            '567b78d8b4b4bbcb77c5f134d57bc503c34867fcc6341c0b01716bcaa4a21694'
-            'c883dec2b96978874a53700cfe7f26f24f8296767203e970bc6402b4b9945eb8')
+pkgver=3.2.6+11+g07808097
+pkgrel=6
+pkgdesc="An obsolete configuration database system"
+url="https://projects-old.gnome.org/gconf/"
+arch=(x86_64)
+license=(LGPL)
+depends=(gconf lib32-dbus-glib lib32-gtk3)
+makedepends=(intltool gtk-doc gobject-introspection git gnome-common gcc-multilib)
+install=gconf.install
+_commit=0780809731c8ab1c364202b1900d3df106b28626  # master
+source=("lib32-gconf::git+https://gitlab.gnome.org/Archive/gconf.git#commit=$_commit"
+        01_xml-gettext-domain.patch gconf-reload.patch)
+sha256sums=('SKIP'
+            'c883dec2b96978874a53700cfe7f26f24f8296767203e970bc6402b4b9945eb8'
+            '567b78d8b4b4bbcb77c5f134d57bc503c34867fcc6341c0b01716bcaa4a21694')
+
+pkgver() {
+  cd $pkgname
+  git describe --tags | sed 's/-/+/g'
+}
 
 prepare() {
-  cd GConf-${pkgver}
+  cd $pkgname
 
+  # Patch from fedora - reloads gconf after installing schemas
   patch -Np1 -i ../gconf-reload.patch
+
+  # http://bugzilla.gnome.org/show_bug.cgi?id=568845
   patch -Np1 -i ../01_xml-gettext-domain.patch
-  sed -i '1s|#!/usr/bin/env python$|&2|' gsettings/gsettings-schema-convert
+
+  # The following line copied from Fedora
+  # https://src.fedoraproject.org/rpms/GConf2/blob/70ed26d67b563d858a84505622d11f41879a6b37/f/GConf2.spec#_90
+  2to3 --write --nobackup gsettings/gsettings-schema-convert
+
+  sed -i '1s|#!/usr/bin/env python$|#!/usr/bin/python|' gsettings/gsettings-schema-convert
+
+  NOCONFIGURE=1 ./autogen.sh
 }
 
 build() {
-  cd GConf-${pkgver}
+  cd $pkgname
 
   export CC='gcc -m32'
   export CXX='g++ -m32'
   export PKG_CONFIG_PATH='/usr/lib32/pkgconfig'
 
   ./configure \
-    --prefix='/usr' \
-    --libdir='/usr/lib32' \
-    --libexecdir='/usr/lib32/GConf' \
-    --sysconfdir='/etc' \
-    --localstatedir='/var' \
+    --prefix=/usr \
+    --libdir=/usr/lib32 \
+    --sysconfdir=/etc \
+    --localstatedir=/var \
+    --libexecdir=/usr/lib32 \
     --enable-defaults-service \
-    --disable-gtk-doc-html \
-    --disable-orbit \
+    --disable-gtk-doc \
     --disable-static \
-    --with-gtk='3.0'
+    --disable-orbit
+  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
+  make
+}
 
-  make pkglibdir=/usr/lib32/GConf
+check() {
+  cd $pkgname
+  make check
 }
 
 package() {
-  cd GConf-${pkgver}
-
-  make DESTDIR="${pkgdir}" install
+  DESTDIR="$pkgdir" make -C $pkgname install
   rm -rf "${pkgdir}"/{etc,usr/{bin,include,share}}
 }
-
-# vim: ts=2 sw=2 et:
diff --git a/gconf.install b/gconf.install
index 898b59fb3b74..18846540e6db 100644
--- a/gconf.install
+++ b/gconf.install
@@ -1,14 +1,3 @@
-post_install() {
-  ldconfig -r .
-  usr/bin/gio-querymodules-32 usr/lib32/gio/modules
-}
-
 post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  usr/bin/gio-querymodules-32 usr/lib32/gio/modules
+  pkill -fx /usr/lib32/gconfd-2 || :
 }
-
-# vim: ts=2 sw=2 et: