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

devans at macports.org devans at macports.org
Wed Feb 17 15:41:42 PST 2016


Revision: 145812
          https://trac.macports.org/changeset/145812
Author:   devans at macports.org
Date:     2016-02-17 15:41:42 -0800 (Wed, 17 Feb 2016)
Log Message:
-----------
GNOME-3/unstable: gtk3, update to version 3.19.9, patch to fix +quartz build issue, check gdk-pixbuf2 variant against build variant.

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

Added Paths:
-----------
    users/devans/GNOME-3/unstable/dports/gnome/gtk3/files/patch-gtk-gtkclipboard-quartz.c.diff

Modified: users/devans/GNOME-3/unstable/dports/gnome/gtk3/Portfile
===================================================================
--- users/devans/GNOME-3/unstable/dports/gnome/gtk3/Portfile	2016-02-17 23:36:38 UTC (rev 145811)
+++ users/devans/GNOME-3/unstable/dports/gnome/gtk3/Portfile	2016-02-17 23:41:42 UTC (rev 145812)
@@ -11,7 +11,7 @@
 name                gtk3
 set real_name       gtk+
 epoch               1
-version             3.19.8
+version             3.19.9
 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  1026f32bf8cf1aaf8a6c26fbbc8b1dde7f970dba \
-                    sha256  ad42d0f34ea7b07a72659e5cdadd79c7d7bf8a2acc802096abf10740f2c073bc
+checksums           rmd160  60afc34b00e55927dc6e94eddf640fde66c48526 \
+                    sha256  65b6a7ba9c945c747500dc0071e6d99b12739860d0f6a71b842ea776f402b90c
 
 minimum_xcodeversions {9 3.1}
 
@@ -55,7 +55,8 @@
                     lib/libpango-1.0.dylib \
                     lib/libtiff.dylib
 
-patchfiles          nawk.patch
+patchfiles          nawk.patch \
+                    patch-gtk-gtkclipboard-quartz.c.diff
 
 # gtk3 +quartz uses instancetype which is not available
 # before approximately Xcode 4.6 (#49391)
@@ -230,6 +231,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 +239,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 \

Added: users/devans/GNOME-3/unstable/dports/gnome/gtk3/files/patch-gtk-gtkclipboard-quartz.c.diff
===================================================================
--- users/devans/GNOME-3/unstable/dports/gnome/gtk3/files/patch-gtk-gtkclipboard-quartz.c.diff	                        (rev 0)
+++ users/devans/GNOME-3/unstable/dports/gnome/gtk3/files/patch-gtk-gtkclipboard-quartz.c.diff	2016-02-17 23:41:42 UTC (rev 145812)
@@ -0,0 +1,11 @@
+--- gtk/gtkclipboard-quartz.c.orig	2016-02-17 15:10:18.000000000 -0800
++++ gtk/gtkclipboard-quartz.c	2016-02-17 15:10:35.000000000 -0800
+@@ -860,7 +860,7 @@
+ GdkPixbuf *
+ gtk_clipboard_wait_for_image (GtkClipboard *clipboard)
+ {
+-  GdkAtom target = gdk_atom_intern_static_string("image/tiff")
++  GdkAtom target = gdk_atom_intern_static_string("image/tiff");
+   int i;
+   GtkSelectionData *data;
+ 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20160217/56ac1090/attachment-0001.html>


More information about the macports-changes mailing list