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

[devans at macports.org]

Revision: 148546
          https://trac.macports.org/changeset/148546
Author:   devans at macports.org
Date:     2016-05-11 01:10:55 -0700 (Wed, 11 May 2016)
Log Message:
-----------
GNOME-3/unstable: gtk3, fix build failure due to bad check for cups.

Modified Paths:
--------------
    users/devans/GNOME-3/unstable/dports/gnome/gtk3/Portfile

Added 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-147673
/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-148545
/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-05-11 08:02:53 UTC (rev 148545)
+++ users/devans/GNOME-3/unstable/dports/gnome/gtk3/Portfile	2016-05-11 08:10:55 UTC (rev 148546)
@@ -55,7 +55,7 @@
                     lib/libpango-1.0.dylib \
                     lib/libtiff.dylib
 
-patchfiles          nawk.patch
+patchfiles          nawk.patch cups.patch
 
 # gtk3 +quartz uses instancetype which is not available
 # before approximately Xcode 4.6 (#49391)

Copied: users/devans/GNOME-3/unstable/dports/gnome/gtk3/files/cups.patch (from rev 148545, users/devans/GNOME-3/stable/dports/gnome/gtk3/files/cups.patch)
===================================================================
--- users/devans/GNOME-3/unstable/dports/gnome/gtk3/files/cups.patch	                        (rev 0)
+++ users/devans/GNOME-3/unstable/dports/gnome/gtk3/files/cups.patch	2016-05-11 08:10:55 UTC (rev 148546)
@@ -0,0 +1,12 @@
+--- 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
+
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20160511/8aac3629/attachment.html>