[147244] trunk/dports/gnome/gtk3

[devans at macports.org]

Revision: 147244
          https://trac.macports.org/changeset/147244
Author:   devans at macports.org
Date:     2016-03-31 16:38:21 -0700 (Thu, 31 Mar 2016)
Log Message:
-----------
gtk3: update to version 3.20.2, add gdk-pixbuf2 to active variant checks.

Modified Paths:
--------------
    trunk/dports/gnome/gtk3/Portfile
    trunk/dports/gnome/gtk3/files/nawk.patch

Property Changed:
----------------
    trunk/dports/gnome/gtk3/


Property changes on: trunk/dports/gnome/gtk3
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/mld-qt-481/dports/gnome/gtk3:92720,92813,92891,92963,93522,93556,93699,93743,93771-93773,93806,93817-93818,93856
/users/devans/GNOME-3/stable/dports/gnome/gtk3:119527-146518
/users/devans/GNOME-3/unstable/dports/gnome/gtk3:119539-125620,128305-134375
/users/rmstonecipher/gnome/gtk3:102363-103172
   + /branches/mld-qt-481/dports/gnome/gtk3:92720,92813,92891,92963,93522,93556,93699,93743,93771-93773,93806,93817-93818,93856
/users/devans/GNOME-3/stable/dports/gnome/gtk3:119527-147236
/users/devans/GNOME-3/unstable/dports/gnome/gtk3:119539-125620,128305-134375,141777-146944
/users/rmstonecipher/gnome/gtk3:102363-103172

Modified: trunk/dports/gnome/gtk3/Portfile
===================================================================
--- trunk/dports/gnome/gtk3/Portfile	2016-03-31 23:35:30 UTC (rev 147243)
+++ trunk/dports/gnome/gtk3/Portfile	2016-03-31 23:38:21 UTC (rev 147244)
@@ -11,7 +11,7 @@
 name                gtk3
 set real_name       gtk+
 epoch               1
-version             3.18.9
+version             3.20.2
 set branch          [join [lrange [split ${version} .] 0 1] .]
 categories          gnome x11
 license             LGPL-2.1+
@@ -31,8 +31,8 @@
 
 master_sites        gnome:sources/gtk+/${branch}/
 
-checksums           rmd160  836f1a6e9b1db24abb66dab3a30880c67c64d101 \
-                    sha256  783d7f8b00f9b4224cc94d7da885a67598e711c2d6d79c9c873c6b203e83acbd
+checksums           rmd160  001b3d75e3c10eefa4ac9b0e317d5e8b56c5bf1b \
+                    sha256  1ab1d1068ea55e0046f437d69983f164df5e68cb2e9fdfb38787b867f33f69f7
 
 minimum_xcodeversions {9 3.1}
 
@@ -230,6 +230,7 @@
 variant quartz conflicts x11 {
     require_active_variants path:lib/pkgconfig/cairo.pc:cairo quartz
     require_active_variants path:lib/pkgconfig/pango.pc:pango quartz
+    require_active_variants port:gdk-pixbuf2 "" x11
 
     configure.args-append   --enable-quartz-backend
 }
@@ -237,6 +238,7 @@
 variant x11 conflicts quartz {
     require_active_variants path:lib/pkgconfig/cairo.pc:cairo x11
     require_active_variants path:lib/pkgconfig/pango.pc:pango x11
+    require_active_variants port:gdk-pixbuf2 x11
 
     depends_lib-append      port:xorg-libXi \
                             port:xorg-libXrandr \

Modified: trunk/dports/gnome/gtk3/files/nawk.patch
===================================================================
--- trunk/dports/gnome/gtk3/files/nawk.patch	2016-03-31 23:35:30 UTC (rev 147243)
+++ trunk/dports/gnome/gtk3/files/nawk.patch	2016-03-31 23:38:21 UTC (rev 147244)
@@ -1,6 +1,6 @@
 --- configure.orig	2015-11-16 12:32:00.000000000 -0600
 +++ configure	2015-11-18 00:20:49.000000000 -0600
-@@ -3418,7 +3418,7 @@
+@@ -3432,7 +3432,7 @@
  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MKDIR_P" >&5
  $as_echo "$MKDIR_P" >&6; }
  
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20160331/def8f3fe/attachment.html>