version 2.7.2-1

3 files changed, 77 insertions, 17 deletions

diff --git a/.SRCINFO b/.SRCINFO
index b5181ceb130b..5194a0c7e4db 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,36 +1,40 @@
 # Generated by mksrcinfo v8
-# Sat May 20 05:45:14 UTC 2017
+# Sun Sep 10 10:10:29 UTC 2017
 pkgbase = udisks2-nosystemd
 	pkgdesc = Disk Management Service, version 2
-	pkgver = 2.6.5
+	pkgver = 2.7.2
 	pkgrel = 1
 	url = http://www.freedesktop.org/wiki/Software/udisks
 	arch = i686
 	arch = x86_64
 	groups = eudev-base
 	license = GPL2
-	makedepends = intltool
 	makedepends = docbook-xsl
 	makedepends = gobject-introspection
 	makedepends = gnome-common
-	depends = glib2
-	depends = udev
+	makedepends = intltool
+	makedepends = parted
+	makedepends = libiscsi
 	depends = polkit-consolekit
 	depends = libatasmart
-	depends = util-linux
 	depends = libgudev
+	depends = libblockdev
+	optdepends = gptfdisk: GUID partition table support
 	optdepends = parted: partition management
 	optdepends = gptfdisk: GUID partition table support
 	optdepends = ntfs-3g: NTFS filesystem management support
 	optdepends = dosfstools: VFAT filesystem management support
-	provides = udisks2=2.6.5
+	optdepends = libiscsi: iSCSI support
+	provides = udisks2=2.7.2
 	conflicts = udisks2
 	conflicts = udisks2-eudev
 	replaces = udisks2
 	replaces = udisks2-eudev
 	options = !libtool
-	source = https://github.com/storaged-project/udisks/archive/udisks-2.6.5.tar.gz
-	sha256sums = 817e2de4efab458a98b24b15066933692e6ee3777430211b4e7aeddd0b9045f2
+	source = https://github.com/storaged-project/udisks/archive/udisks-2.7.2.tar.gz
+	source = fix_build.patch
+	sha256sums = 34d834520efcfbb8cca33ccf703e45752b32772ae766673dab6360202c7838aa
+	sha256sums = 9b9144de4d68703f574987d36dbe08c3b97d525adea65870f9b940f3315eefe7
 
 pkgname = udisks2-nosystemd
 
diff --git a/PKGBUILD b/PKGBUILD
index b91d182b41c8..4c976e3abc77 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,25 +3,40 @@
 # Contributor: Ionut Biru <ibiru@archlinux.org>
 
 pkgname=udisks2-nosystemd
-pkgver=2.6.5
+pkgver=2.7.2
 pkgrel=1
 pkgdesc="Disk Management Service, version 2"
 arch=('i686' 'x86_64')
 url="http://www.freedesktop.org/wiki/Software/udisks"
 license=('GPL2')
 groups=('eudev-base')
-depends=('glib2' 'udev' 'polkit-consolekit' 'libatasmart' 'util-linux' 'libgudev')
-makedepends=('intltool' 'docbook-xsl' 'gobject-introspection' 'gnome-common')
-optdepends=('parted: partition management'
+depends=('polkit-consolekit' 'libatasmart' 'libgudev' 'libblockdev')
+makedepends=('docbook-xsl' 'gobject-introspection' 'gnome-common' 'intltool' 'parted' 'libiscsi')
+optdepends=('gptfdisk: GUID partition table support'
+            'parted: partition management'
             'gptfdisk: GUID partition table support'
             'ntfs-3g: NTFS filesystem management support'
-            'dosfstools: VFAT filesystem management support')
+            'dosfstools: VFAT filesystem management support'
+            'libiscsi: iSCSI support')
 provides=("udisks2=${pkgver}")
 conflicts=('udisks2' 'udisks2-eudev')
 replaces=('udisks2' 'udisks2-eudev')
 options=(!libtool)
-source=(https://github.com/storaged-project/udisks/archive/udisks-$pkgver.tar.gz)
-sha256sums=('817e2de4efab458a98b24b15066933692e6ee3777430211b4e7aeddd0b9045f2')
+source=(https://github.com/storaged-project/udisks/archive/udisks-$pkgver.tar.gz
+        fix_build.patch)
+sha256sums=('34d834520efcfbb8cca33ccf703e45752b32772ae766673dab6360202c7838aa'
+            '9b9144de4d68703f574987d36dbe08c3b97d525adea65870f9b940f3315eefe7')
+
+prepare() {
+  cd "udisks-udisks-$pkgver"
+
+  sed -e 's/AC_MSG_ERROR(\[libstoragemgmt/AC_MSG_WARN([libstoragemgmt/' \
+      -e 's/AC_MSG_ERROR(\[libconfig/AC_MSG_WARN([libconfig/' \
+      -i configure.ac
+
+  # Fix build with gtk-doc 2.16. See https://github.com/storaged-project/udisks/issues/389
+  patch -p1 -i "$srcdir"/fix_build.patch
+}
 
 build() {
   cd "udisks-udisks-$pkgver"
@@ -31,7 +46,8 @@ build() {
       --localstatedir=/var \
       --disable-static \
       --sbindir=/usr/bin \
-      --libexecdir=/usr/lib
+      --libexecdir=/usr/lib \
+      --enable-available-modules
   make
 }
 
diff --git a/fix_build.patch b/fix_build.patch
new file mode 100644
index 000000000000..fb58d3d0742e
--- /dev/null
+++ b/fix_build.patch
@@ -0,0 +1,40 @@
+From e8d24752672c3359e27dca05686ac96226fd00bf Mon Sep 17 00:00:00 2001
+From: Vojtech Trefny <vtrefny@redhat.com>
+Date: Mon, 28 Aug 2017 15:03:08 +0200
+Subject: [PATCH] Fix building documentation with new gtk-doc
+
+New gtk-doc 2.16 for some reason automatically creates a no-op
+"$(DOC_MAIN_SGML_FILE)" make target that overrides our target
+for creating "udisks2-docs.xml", "udisks2.types" and
+"udisks2-sections.txt" files.
+---
+ doc/Makefile.am | 10 ++++++++--
+ 1 file changed, 8 insertions(+), 2 deletions(-)
+
+diff --git a/doc/Makefile.am b/doc/Makefile.am
+index dff59e9c..8f7b77e8 100644
+--- a/doc/Makefile.am
++++ b/doc/Makefile.am
+@@ -73,10 +73,14 @@ extra_files =                                                                  \
+ 
+ # ------------------------------------------------------------------------------
+ 
+-all-local: $(DOC_MAIN_SGML_FILE)
++all-local: generate-main-sgml-file
++
++# New gtk-doc 2.16 for some reason automatically creates a no-op
++# "$(DOC_MAIN_SGML_FILE)" make target that overrides our target
++$(DOC_MAIN_SGML_FILE): generate-main-sgml-file
+ 
+ # udisks2-docs.xml, udisks2-sections.txt udisks2.types
+-$(DOC_MAIN_SGML_FILE): $(DOC_MAIN_SGML_FILE).in $(UDISKS_SECTIONS).in $(UDISKS_TYPES).in
++generate-main-sgml-file: $(DOC_MAIN_SGML_FILE).in $(UDISKS_SECTIONS).in $(UDISKS_TYPES).in
+ 	$(AM_V_at) rm -f $(DOC_MAIN_SGML_FILE) $(UDISKS_SECTIONS) $(UDISKS_TYPES) && \
+ 	cp $(DOC_MAIN_SGML_FILE).in $(builddir)/$(DOC_MAIN_SGML_FILE) && \
+ 	cp $(UDISKS_SECTIONS).in $(builddir)/$(UDISKS_SECTIONS) && \
+@@ -261,3 +265,5 @@ CLEANFILES +=                                                                  \
+ 	*.stamp                                                                \
+ 	-rf xml html tmpl                                                      \
+ 	$(NULL)
++
++.PHONY: generate-main-sgml-file