[153004] users/devans/GNOME-3/stable/dports/gnome/dconf-editor

[devans at macports.org]

Revision: 153004
          https://trac.macports.org/changeset/153004
Author:   devans at macports.org
Date:     2016-09-22 00:49:13 -0700 (Thu, 22 Sep 2016)
Log Message:
-----------
GNOME-3/stable: dconf-editor, merge unstable to stable and update to stable version 3.22.0, use upstream patch to fix appdata installation.

Modified Paths:
--------------
    users/devans/GNOME-3/stable/dports/gnome/dconf-editor/Portfile

Added Paths:
-----------
    users/devans/GNOME-3/stable/dports/gnome/dconf-editor/files/fix-appdata-installation.patch

Property Changed:
----------------
    users/devans/GNOME-3/stable/dports/gnome/dconf-editor/


Property changes on: users/devans/GNOME-3/stable/dports/gnome/dconf-editor
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/mld-qt-481/dports/gnome/dconf-editor:92720,92813,92891,92963,93522,93556,93699,93743,93771-93773,93806,93817-93818,93856
/users/devans/GNOME-3/unstable/dports/gnome/dconf-editor:141711-147190
/users/rmstonecipher/gnome/dconf-editor:102363-103172
   + /branches/mld-qt-481/dports/gnome/dconf-editor:92720,92813,92891,92963,93522,93556,93699,93743,93771-93773,93806,93817-93818,93856
/users/devans/GNOME-3/unstable/dports/gnome/dconf-editor:141711-147190,148132-153003
/users/rmstonecipher/gnome/dconf-editor:102363-103172

Modified: users/devans/GNOME-3/stable/dports/gnome/dconf-editor/Portfile
===================================================================
--- users/devans/GNOME-3/stable/dports/gnome/dconf-editor/Portfile	2016-09-22 07:28:11 UTC (rev 153003)
+++ users/devans/GNOME-3/stable/dports/gnome/dconf-editor/Portfile	2016-09-22 07:49:13 UTC (rev 153004)
@@ -4,7 +4,7 @@
 PortSystem          1.0
 
 name                dconf-editor
-version             3.20.3
+version             3.22.0
 set branch          [join [lrange [split ${version} .] 0 1] .]
 maintainers         devans openmaintainer
 categories          gnome
@@ -21,8 +21,8 @@
 
 use_xz              yes
 
-checksums           rmd160  e0c09d2427fde084a126ab1e83ebb09ff6526d30 \
-                    sha256  a8721499a277550b28d8dd94dafbea6efeb95fa153020da10603d0d4d628c579
+checksums           rmd160  b0c185196076490522d0456a949088af7f3db334 \
+                    sha256  4ca3c2c3836f4c944f161540d1521507dab8e7bee0cac7d543560808efb9246f
 
 depends_build       port:pkgconfig \
                     port:intltool \
@@ -40,6 +40,8 @@
 
 depends_run         port:gnome-themes-standard
 
+patchfiles          fix-appdata-installation.patch
+
 # reconfigure using upstream autogen.sh for intltool 0.51 compatibility
 
 post-patch {

Added: users/devans/GNOME-3/stable/dports/gnome/dconf-editor/files/fix-appdata-installation.patch
===================================================================
--- users/devans/GNOME-3/stable/dports/gnome/dconf-editor/files/fix-appdata-installation.patch	                        (rev 0)
+++ users/devans/GNOME-3/stable/dports/gnome/dconf-editor/files/fix-appdata-installation.patch	2016-09-22 07:49:13 UTC (rev 153004)
@@ -0,0 +1,26 @@
+From a51f887042419d721fcb996751b74e528dbabaf5 Mon Sep 17 00:00:00 2001
+From: Kalev Lember <klember at redhat.com>
+Date: Thu, 22 Sep 2016 06:28:25 +0200
+Subject: Fix appdata installation
+
+Add back @APPSTREAM_XML_RULES@ that got accidentally lost in commit
+8ae85f0.
+---
+ editor/Makefile.am | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/editor/Makefile.am b/editor/Makefile.am
+index 3ef2952..a3d13c1 100644
+--- editor/Makefile.am
++++ editor/Makefile.am
+@@ -68,6 +68,7 @@ ca.desrt.dconf-editor.service: Makefile
+ 	             echo 'Exec=${bindir}/dconf-editor --gapplication-service') > $@.tmp && \
+ 	             mv $@.tmp $@
+ 
++ at APPSTREAM_XML_RULES@
+ appstream_in_files = ca.desrt.dconf-editor.appdata.xml.in
+ appstream_XML = $(appstream_in_files:.xml.in=.xml)
+ @INTLTOOL_XML_RULE@
+-- 
+cgit v0.12
+
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20160922/fc954459/attachment.html>