summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorlilac2020-01-03 17:41:27 +0800
committerlilac2020-01-03 17:41:27 +0800
commite729d773dff796aeb625f169b35790be887cf7c2 (patch)
tree9342bac28585fd7e050845893d6d66bcfd99a005
parent52b848ec3fbb418e35c8e5bb66e97c43f960d318 (diff)
downloadaur-e729d773dff796aeb625f169b35790be887cf7c2.tar.gz
update by lilac
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD11
2 files changed, 9 insertions, 6 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 9b0c5d2d324a..ba767062bca6 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = gconf
pkgdesc = An obsolete configuration database system
pkgver = 3.2.6+11+g07808097
- pkgrel = 5
+ pkgrel = 6
url = https://projects-old.gnome.org/gconf/
install = gconf.install
arch = x86_64
@@ -15,7 +15,7 @@ pkgbase = gconf
depends = polkit
depends = libldap
depends = dbus-glib
- depends = python2
+ depends = python
source = git+https://gitlab.gnome.org/Archive/gconf.git#commit=0780809731c8ab1c364202b1900d3df106b28626
source = 01_xml-gettext-domain.patch
source = gconf-reload.patch
diff --git a/PKGBUILD b/PKGBUILD
index 11fe7b467aaf..afd4e9dc08fd 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,12 +2,12 @@
pkgname=gconf
pkgver=3.2.6+11+g07808097
-pkgrel=5
+pkgrel=6
pkgdesc="An obsolete configuration database system"
url="https://projects-old.gnome.org/gconf/"
arch=(x86_64)
license=(LGPL)
-depends=(libxml2 polkit libldap dbus-glib python2)
+depends=(libxml2 polkit libldap dbus-glib python)
makedepends=(intltool gtk-doc gobject-introspection git gnome-common)
install=gconf.install
_commit=0780809731c8ab1c364202b1900d3df106b28626 # master
@@ -36,8 +36,11 @@ prepare() {
# http://bugzilla.gnome.org/show_bug.cgi?id=568845
patch -Np1 -i ../01_xml-gettext-domain.patch
- # Python2 fix
- 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
}