[150427] users/devans/GNOME-3/unstable/dports/gnome/gtk3

[devans at macports.org]

Revision: 150427
          https://trac.macports.org/changeset/150427
Author:   devans at macports.org
Date:     2016-07-19 01:22:07 -0700 (Tue, 19 Jul 2016)
Log Message:
-----------
GNOME-3/unstable: gtk3, merge recent changes from stable and update to version 3.21.4.

Modified Paths:
--------------
    users/devans/GNOME-3/unstable/dports/gnome/gtk3/Portfile
    users/devans/GNOME-3/unstable/dports/gnome/gtk3/files/nawk.patch

Removed Paths:
-------------
    users/devans/GNOME-3/unstable/dports/gnome/gtk3/files/cups.patch

Property Changed:
----------------
    users/devans/GNOME-3/unstable/dports/gnome/gtk3/


Property changes on: users/devans/GNOME-3/unstable/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
/trunk/dports/gnome/gtk3:119527-148544
/users/devans/GNOME-3/stable/dports/gnome/gtk3:148128-148545
/users/devans/GNOME-3/unstable/dports/gnome/gtk3:119539-125620,128305-134375,141777-146944
/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
/trunk/dports/gnome/gtk3:119527-148544
/users/devans/GNOME-3/stable/dports/gnome/gtk3:148128-150414
/users/devans/GNOME-3/unstable/dports/gnome/gtk3:119539-125620,128305-134375,141777-146944
/users/rmstonecipher/gnome/gtk3:102363-103172

Modified: users/devans/GNOME-3/unstable/dports/gnome/gtk3/Portfile
===================================================================
--- users/devans/GNOME-3/unstable/dports/gnome/gtk3/Portfile	2016-07-19 08:21:48 UTC (rev 150426)
+++ users/devans/GNOME-3/unstable/dports/gnome/gtk3/Portfile	2016-07-19 08:22:07 UTC (rev 150427)
@@ -11,7 +11,7 @@
 name                gtk3
 set real_name       gtk+
 epoch               1
-version             3.21.1
+version             3.21.4
 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  a04a242c6b231c6872563d3e9e736e8aadfe3c8a \
-                    sha256  d62513b28d545675cfbc1df963aef5abec4bbfaa17e8fdc22304a973b378abca
+checksums           rmd160  ce035f5a4439da42817d3c30e0f28fa541c559a8 \
+                    sha256  46bb46c420b1406dcb7d6034a9a4c80340f0db464fb98a8c271343bf56e43cf1
 
 minimum_xcodeversions {9 3.1}
 
@@ -43,7 +43,6 @@
                     port:gdk-pixbuf2 \
                     path:lib/pkgconfig/glib-2.0.pc:glib2 \
                     port:gobject-introspection \
-                    port:mesa \
                     port:libepoxy
                     
 depends_run         port:shared-mime-info \
@@ -55,7 +54,7 @@
                     lib/libpango-1.0.dylib \
                     lib/libtiff.dylib
 
-patchfiles          nawk.patch cups.patch
+patchfiles          nawk.patch
 
 # gtk3 +quartz uses instancetype which is not available
 # before approximately Xcode 4.6 (#49391)
@@ -247,7 +246,8 @@
                             port:xorg-libXdamage \
                             port:xorg-libXcomposite \
                             port:xorg-libXfixes \
-                            port:at-spi2-atk
+                            port:at-spi2-atk \
+                            port:mesa
 
     configure.args-append   --enable-xinerama \
                             --x-include=${prefix}/include \

Deleted: users/devans/GNOME-3/unstable/dports/gnome/gtk3/files/cups.patch
===================================================================
--- users/devans/GNOME-3/unstable/dports/gnome/gtk3/files/cups.patch	2016-07-19 08:21:48 UTC (rev 150426)
+++ users/devans/GNOME-3/unstable/dports/gnome/gtk3/files/cups.patch	2016-07-19 08:22:07 UTC (rev 150427)
@@ -1,12 +0,0 @@
---- configure.orig	2016-05-10 20:25:04.000000000 -0700
-+++ configure	2016-05-10 20:25:37.000000000 -0700
-@@ -25784,7 +25784,7 @@ fi
-     CUPS_API_MAJOR=`echo $ECHO_N $CUPS_API_VERSION | awk -F. '{print $1}'`
-     CUPS_API_MINOR=`echo $ECHO_N $CUPS_API_VERSION | awk -F. '{print $2}'`
- 
--    if test $CUPS_API_MAJOR -gt 1 -o \
-+    if test $CUPS_API_MAJOR -lt 1 -o \
-             $CUPS_API_MAJOR -eq 1 -a $CUPS_API_MINOR -lt 2; then
-       as_fn_error $? "CUPS >= 1.2 not found" "$LINENO" 5
-     fi
-

Modified: users/devans/GNOME-3/unstable/dports/gnome/gtk3/files/nawk.patch
===================================================================
--- users/devans/GNOME-3/unstable/dports/gnome/gtk3/files/nawk.patch	2016-07-19 08:21:48 UTC (rev 150426)
+++ users/devans/GNOME-3/unstable/dports/gnome/gtk3/files/nawk.patch	2016-07-19 08:22:07 UTC (rev 150427)
@@ -1,6 +1,6 @@
 --- configure.orig	2015-11-16 12:32:00.000000000 -0600
 +++ configure	2015-11-18 00:20:49.000000000 -0600
-@@ -3432,7 +3432,7 @@
+@@ -3629,7 +3629,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/20160719/14daad8e/attachment.html>