[152970] users/devans/GNOME-3/stable/dports/gnome/adwaita-icon-theme

[devans at macports.org]

Revision: 152970
          https://trac.macports.org/changeset/152970
Author:   devans at macports.org
Date:     2016-09-21 08:42:43 -0700 (Wed, 21 Sep 2016)
Log Message:
-----------
GNOME-3/stable: adwaita-icon-theme, merge unstable to stable and update to stable version 3.22.0, remove outdated pre-activate phase.

Modified Paths:
--------------
    users/devans/GNOME-3/stable/dports/gnome/adwaita-icon-theme/Portfile
    users/devans/GNOME-3/stable/dports/gnome/adwaita-icon-theme/files/patch-configure.ac.diff

Property Changed:
----------------
    users/devans/GNOME-3/stable/dports/gnome/adwaita-icon-theme/


Property changes on: users/devans/GNOME-3/stable/dports/gnome/adwaita-icon-theme
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk/dports/gnome/adwaita-icon-theme:126100-152324
/users/devans/GNOME-3/unstable/dports/gnome/adwaita-icon-theme:128305-134376,138023-140553,145907-147001,150429-152301
   + /trunk/dports/gnome/adwaita-icon-theme:126100-152324
/users/devans/GNOME-3/unstable/dports/gnome/adwaita-icon-theme:128305-134376,138023-140553,145907-147001,150429-152969

Modified: users/devans/GNOME-3/stable/dports/gnome/adwaita-icon-theme/Portfile
===================================================================
--- users/devans/GNOME-3/stable/dports/gnome/adwaita-icon-theme/Portfile	2016-09-21 13:43:15 UTC (rev 152969)
+++ users/devans/GNOME-3/stable/dports/gnome/adwaita-icon-theme/Portfile	2016-09-21 15:42:43 UTC (rev 152970)
@@ -4,7 +4,7 @@
 PortSystem          1.0
 
 name                adwaita-icon-theme
-version             3.20
+version             3.22.0
 set branch          [join [lrange [split ${version} .] 0 1] .]
 categories          gnome
 maintainers         devans openmaintainer
@@ -20,8 +20,8 @@
 
 use_xz              yes
 
-checksums           rmd160  210c9bf8e1f9be0d396726638f0eb4ebfa723500 \
-                    sha256  7a0a887349f340dd644032f89d81264b694c4b006bd51af1c2c368d431e7ae35
+checksums           rmd160  2d215e67a239a90f968bebe90bbb5ae5c9c3ca54 \
+                    sha256  c18bf6e26087d9819a962c77288b291efab25d0419b73d909dd771716a45dcb7
 
 depends_build       port:pkgconfig \
                     port:icon-naming-utils
@@ -36,13 +36,4 @@
 
 use_parallel_build  no
 
-pre-activate {
-    if {![catch {set installed [lindex [registry_active gnome-themes-standard] 0]}]} {
-        set _version [lindex $installed 1]
-        if {[vercmp $_version 3.13.0] < 0} {
-            registry_deactivate_composite gnome-themes-standard "" [list ports_nodepcheck 1]
-        }
-    }
-}
-
 livecheck.type      gnome

Modified: users/devans/GNOME-3/stable/dports/gnome/adwaita-icon-theme/files/patch-configure.ac.diff
===================================================================
--- users/devans/GNOME-3/stable/dports/gnome/adwaita-icon-theme/files/patch-configure.ac.diff	2016-09-21 13:43:15 UTC (rev 152969)
+++ users/devans/GNOME-3/stable/dports/gnome/adwaita-icon-theme/files/patch-configure.ac.diff	2016-09-21 15:42:43 UTC (rev 152970)
@@ -1,7 +1,7 @@
---- configure.ac.orig	2015-06-25 06:58:20.000000000 -0700
-+++ configure.ac	2015-06-25 23:56:11.000000000 -0700
+--- configure.ac.orig	2016-09-21 03:07:06.000000000 -0700
++++ configure.ac	2016-09-21 08:24:32.000000000 -0700
 @@ -29,7 +29,7 @@
- AC_SUBST([install_sizes], ["8x8 16x16 22x22 24x24 32x32 48x48 64x64 96x96 256x256"])
+ AC_SUBST([install_sizes], ["8x8 16x16 22x22 24x24 32x32 48x48 64x64 96x96 256x256 512x512"])
  
  AC_PROG_LN_S
 -AC_PATH_PROG(GTK_UPDATE_ICON_CACHE, gtk-update-icon-cache)
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20160921/5b71fec3/attachment-0001.html>