Changeset 139554


Ignore:
Timestamp:
Aug 20, 2015, 9:26:26 AM (4 years ago)
Author:
devans@…
Message:

gtksourceview2: reintroduce +quartz variant removed in r139437 and only depend on gtk-osx-application-gtk2 if it is set, fixes possible build failures when building with gtk2 +x11, check variant of the active gtk2 to make sure it matches the intended build, see comments for rationale, increment revision to correctly tag archived binaries.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/dports/gnome/gtksourceview2/Portfile

    r139438 r139554  
    33
    44PortSystem      1.0
     5PortGroup       active_variants 1.1
    56
    67name                gtksourceview2
    78set my_name     gtksourceview
    89version             2.10.5
    9 revision        8
     10revision        9
    1011license         LGPL-2.1+
    1112# respository indicates they were in process of shift
     
    4647    port:gettext \
    4748    port:gtk2 \
    48     port:libxml2 \
    49     port:gtk-osx-application-gtk2
    50 
    51 
     49    port:libxml2
    5250
    5351patchfiles      patch-configure.ac.diff \
     
    8179}
    8280
     81# although this port correctly senses the installed variant of gtk2 and configures accordingly,
     82# gtk-osx-application-gtk2 only builds with gtk2 +quartz and will fail to build if gtk2 +x11
     83# is active. Since this can break the x11 build of this port, only depend on it if +quartz
     84# is set. It's not used when building with gtk2 +x11 anyway.
     85 
     86variant quartz {
     87    depends_lib-append  port:gtk-osx-application-gtk2
     88}
     89
     90# make sure the right variant of gtk2 is installed for the intended build
     91
     92if {[variant_isset quartz]} {
     93    require_active_variants gtk2 quartz
     94} else {
     95    require_active_variants gtk2 x11
     96}
     97
    8398variant glade description {Build glade catalog} {
    8499    depends_lib-append port:glade3
Note: See TracChangeset for help on using the changeset viewer.