Changeset 99040

Timestamp:

Oct 24, 2012, 10:30:54 PM (12 years ago)

Author:

ryandesign@…

Message:

gobject-introspection: remove glib2_devel variant and use its patch always, now that a new stable version of glib2 is out (#36702)

File:

• trunk/dports/gnome/gobject-introspection/Portfile (modified) (3 diffs)

trunk/dports/gnome/gobject-introspection/Portfile

@@ -6 +6 @@
 name                gobject-introspection
 version             1.32.1
-revision            3
+revision            4
 set branch          [join [lrange [split ${version} .] 0 1] .]
 categories          gnome
@@ -30 +30 @@
                     port:libffi \
                     port:python27 \
-                    port:glib2
-                    # disabled, because a different set of patches needs to be
-                    # applied depending on the glib2 version used and doing so
-                    # without specifying a variant would give different results
-                    # for the same configuration (i.e. non-reproducible build)
-                    #path:lib/pkgconfig/glib-2.0.pc:glib2 \
+                    path:lib/pkgconfig/glib-2.0.pc:glib2
 
-
-patchfiles          patch-giscanner-scannerlexer.l-support-__inline__.patch \
+patchfiles          patch-gir-gio-2.0.c-fix-wrong-naming.patch \
+                    patch-giscanner-scannerlexer.l-support-__inline__.patch \
                     patch-giscanner-shlib.py-use-absolute-linkage-paths.patch \
                     patch-giscanner-utils.py-use-absolute-linkage-paths.patch
@@ -60 +55 @@
 livecheck.url       http://ftp.gnome.org/pub/gnome/sources/${name}/${branch}/
 livecheck.regex     {LATEST-IS-(\d+(?:\.\d+)*)}
-
-if {[catch {registry_active glib2-devel}] == 0} {
-    # if the user has installed glib2-devel, use that by default
-    default_variants +glib2_devel
-}
-
-variant glib2_devel description {Build against glib2-devel rather than glib2} {
-    patchfiles-append patch-gir-gio-2.0.c-fix-wrong-naming.patch
-    depends_lib-delete port:glib2
-    depends_lib-append port:glib2-devel
-}