[140513] users/devans/GNOME-3/stable/dports/x11
devans at macports.org
devans at macports.org
Mon Sep 21 07:55:44 PDT 2015
Revision: 140513
https://trac.macports.org/changeset/140513
Author: devans at macports.org
Date: 2015-09-21 07:55:44 -0700 (Mon, 21 Sep 2015)
Log Message:
-----------
GNOME-3/stable: pango, copy from trunk and update to version 1.38.0 for testing.
Modified Paths:
--------------
users/devans/GNOME-3/stable/dports/x11/pango/Portfile
users/devans/GNOME-3/stable/dports/x11/pango/files/patch-ltmain.sh.diff
Added Paths:
-----------
users/devans/GNOME-3/stable/dports/x11/pango/
Property changes on: users/devans/GNOME-3/stable/dports/x11/pango
___________________________________________________________________
Added: svn:mergeinfo
+ /branches/mld-qt-481/dports/x11/pango:92720,92813,92891,92963,93522,93556,93699,93743,93771-93773,93806,93817-93818,93856
/trunk/dports/x11/pango:136821-139338
/users/devans/GNOME-3/unstable/dports/x11/pango:136857-140511
Modified: users/devans/GNOME-3/stable/dports/x11/pango/Portfile
===================================================================
--- trunk/dports/x11/pango/Portfile 2015-09-21 14:14:44 UTC (rev 140509)
+++ users/devans/GNOME-3/stable/dports/x11/pango/Portfile 2015-09-21 14:55:44 UTC (rev 140513)
@@ -11,8 +11,7 @@
conflicts pango-devel
set my_name pango
epoch 1
-version 1.36.8
-revision 1
+version 1.38.0
set branch [join [lrange [split ${version} .] 0 1] .]
categories x11
maintainers ryandesign openmaintainer
@@ -33,8 +32,8 @@
open-source framework for the layout and rendering \
of internationalized text.
-checksums rmd160 41816cdc622df71ea8b3382229dfa65d3c66fa4e \
- sha256 18dbb51b8ae12bae0ab7a958e7cf3317c9acfc8a1e1103ec2f147164a0fc2d07
+checksums rmd160 dfb5fb8d2a0f97ad41d793f7bf7720371a5c1789 \
+ sha256 1d4e75974bad853ee9ac5fc5caee5e7ab235abbd945d51d01f3806e04e7c226c
depends_build \
port:pkgconfig
@@ -46,48 +45,12 @@
patchfiles patch-ltmain.sh.diff
-configure.ccache no
-
-pre-configure {
- set fontconfig_minimum_version 2.10.91
- set fontconfig_installed_version [exec ${prefix}/bin/pkg-config fontconfig --modversion]
- if {[vercmp ${fontconfig_installed_version} ${fontconfig_minimum_version}] < 0} {
- ui_error "${name} ${version} requires fontconfig ${fontconfig_minimum_version} or later but you have fontconfig ${fontconfig_installed_version}."
- return -code error "incompatible fontconfig version"
- }
-
- set harfbuzz_minimum_version 0.9.9
- set harfbuzz_installed_version [exec ${prefix}/bin/pkg-config harfbuzz --modversion]
- if {[vercmp ${harfbuzz_installed_version} ${harfbuzz_minimum_version}] < 0} {
- ui_error "${name} ${version} requires harfbuzz ${harfbuzz_minimum_version} or later but you have harfbuzz ${harfbuzz_installed_version}."
- return -code error "incompatible harfbuzz version"
- }
-
- set glib_minimum_version 2.33.12
- set glib_installed_version [exec ${prefix}/bin/pkg-config glib-2.0 --modversion]
- if {[vercmp ${glib_installed_version} ${glib_minimum_version}] < 0} {
- ui_error "${name} ${version} requires glib2 ${glib_minimum_version} or later but you have glib2 ${glib_installed_version}."
- return -code error "incompatible glib2 version"
- }
-
- set cairo_minimum_version 1.7.6
- set cairo_installed_version [exec ${prefix}/bin/pkg-config cairo --modversion]
- if {[vercmp ${cairo_installed_version} ${cairo_minimum_version}] < 0} {
- ui_error "${name} ${version} requires cairo ${cairo_minimum_version} or later but you have cairo ${cairo_installed_version}."
- return -code error "incompatible cairo version"
- }
-}
-
configure.args --enable-static \
--disable-silent-rules \
--without-x
gobject_introspection yes
-variant builtin_modules description {Build the modules into Pango statically (most users do not need this variant)} {
- configure.args-append --with-included-modules
-}
-
platform macosx {
variant quartz {
# Although this variant does nothing, pango will automatically build
@@ -125,19 +88,6 @@
}
post-destroot {
- xinstall -d ${destroot}${prefix}/etc/pango
- if {![variant_isset builtin_modules]} {
- xinstall -m 0644 ${worksrcpath}/modules/pangorc \
- ${destroot}${prefix}/etc/pango
- reinplace "s|\\.\\./modules/|${prefix}/etc/pango/|g" \
- ${destroot}${prefix}/etc/pango/pangorc
-
- system "env LANG=C DYLD_LIBRARY_PATH=${destroot}${prefix}/lib \
- ${destroot}${prefix}/bin/pango-querymodules ${destroot}${prefix}/lib/pango/*/modules/*.so \
- >${destroot}${prefix}/etc/pango/pango.modules"
- reinplace s|${destroot}||g ${destroot}${prefix}/etc/pango/pango.modules
- }
-
set docdir ${prefix}/share/doc/${my_name}
xinstall -d ${destroot}${docdir}
xinstall -m 0644 -W ${worksrcpath} AUTHORS ChangeLog COPYING MAINTAINERS NEWS README THANKS \
@@ -147,5 +97,5 @@
test.run yes
test.target check
-livecheck.type gnome
+livecheck.type gnome-with-unstable
livecheck.name ${my_name}
Modified: users/devans/GNOME-3/stable/dports/x11/pango/files/patch-ltmain.sh.diff
===================================================================
--- trunk/dports/x11/pango/files/patch-ltmain.sh.diff 2015-09-21 14:14:44 UTC (rev 140509)
+++ users/devans/GNOME-3/stable/dports/x11/pango/files/patch-ltmain.sh.diff 2015-09-21 14:55:44 UTC (rev 140513)
@@ -1,6 +1,6 @@
---- ltmain.sh.orig 2012-04-15 01:07:38.000000000 -0500
-+++ ltmain.sh 2012-04-15 02:39:51.000000000 -0500
-@@ -5655,7 +5655,7 @@
+--- ltmain.sh.orig 2015-07-20 20:09:15.000000000 -0700
++++ ltmain.sh 2015-07-20 20:47:45.000000000 -0700
+@@ -7070,7 +7070,7 @@
continue
;;
@@ -9,12 +9,12 @@
|-threads|-fopenmp|-openmp|-mp|-xopenmp|-omp|-qsmp=*)
func_append compiler_flags " $arg"
func_append compile_command " $arg"
-@@ -6160,7 +6160,7 @@
+@@ -7604,7 +7604,7 @@
lib=
- found=no
+ found=false
case $deplib in
- -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe \
+ -mt|-mthreads|-kthread|-Kthread|-lpthread|-pthreads|--thread-safe \
|-threads|-fopenmp|-openmp|-mp|-xopenmp|-omp|-qsmp=*)
- if test "$linkmode,$pass" = "prog,link"; then
+ if test prog,link = "$linkmode,$pass"; then
compile_deplibs="$deplib $compile_deplibs"
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20150921/1759b66f/attachment.html>
More information about the macports-changes
mailing list