Ticket #38083: gtk3-active_variants.diff

File gtk3-active_variants.diff, 1.4 KB (added by ryandesign (Ryan Schmidt), 8 years ago)

proposed patch

  • Portfile

     
    100100}
    101101
    102102platform darwin 8 {
    103     if {[variant_isset quartz] || [variant_isset no_x11]} {
     103    if {[variant_isset quartz] || ![variant_isset x11]} {
    104104        configure.ldflags-append  -framework Cocoa -framework Carbon
    105105    }
    106106}
     
    192192    configure.cc "${configure.cc} ${configure.cc_archflags}"
    193193}
    194194
    195 variant no_x11 {}
     195variant quartz conflicts x11 {
     196    require_active_variants cairo quartz
     197    require_active_variants pango quartz
    196198
    197 variant quartz requires no_x11 conflicts x11 {
    198199    configure.args-append   --enable-quartz-backend
    199     require_active_variants cairo quartz
    200     require_active_variants pango {} x11
    201200}
    202201
    203 variant x11 conflicts quartz description {Enable rendering in X11} {
     202variant x11 conflicts quartz no_x11 {
     203    require_active_variants cairo x11
     204    require_active_variants pango x11
     205
    204206    depends_lib-append \
    205207        port:xorg-libXi \
    206208        port:xorg-libXrandr \
     
    213215
    214216    configure.args-append      --enable-xinerama \
    215217                               --x-include=${prefix}/include --x-lib=${prefix}/lib
    216 
    217     require_active_variants cairo x11 no_x11
    218218}
    219219
     220variant no_x11 conflicts x11 description {Legacy compatibility variant} {}
    220221
    221222livecheck.type  regex
    222223livecheck.url   ftp://ftp.gnome.org/pub/gnome/sources/${real_name}/cache.json