[97589] trunk/dports/x11/pango-devel
ryandesign at macports.org
ryandesign at macports.org
Sun Sep 9 10:18:13 PDT 2012
Revision: 97589
https://trac.macports.org/changeset/97589
Author: ryandesign at macports.org
Date: 2012-09-09 10:18:11 -0700 (Sun, 09 Sep 2012)
Log Message:
-----------
pango-devel: avoid needing to have gtk-doc installed (#36049)
Modified Paths:
--------------
trunk/dports/x11/pango-devel/Portfile
Added Paths:
-----------
trunk/dports/x11/pango-devel/files/patch-pango-Makefile.in.diff
Removed Paths:
-------------
trunk/dports/x11/pango-devel/files/patch-pango-Makefile.am.diff
Modified: trunk/dports/x11/pango-devel/Portfile
===================================================================
--- trunk/dports/x11/pango-devel/Portfile 2012-09-09 16:56:37 UTC (rev 97588)
+++ trunk/dports/x11/pango-devel/Portfile 2012-09-09 17:18:11 UTC (rev 97589)
@@ -42,8 +42,7 @@
patchfiles patch-ltmain.sh.diff
-patchfiles-append patch-pango-Makefile.am.diff
-use_autoreconf yes
+patchfiles-append patch-pango-Makefile.in.diff
configure.ccache no
Deleted: trunk/dports/x11/pango-devel/files/patch-pango-Makefile.am.diff
===================================================================
--- trunk/dports/x11/pango-devel/files/patch-pango-Makefile.am.diff 2012-09-09 16:56:37 UTC (rev 97588)
+++ trunk/dports/x11/pango-devel/files/patch-pango-Makefile.am.diff 2012-09-09 17:18:11 UTC (rev 97589)
@@ -1,19 +0,0 @@
-http://git.gnome.org/browse/pango/commit/?id=5859d32ccb52496148d969086a729b56a03c44e7
---- pango/Makefile.am.orig
-+++ pango/Makefile.am
-@@ -332,6 +332,7 @@ libpangocairo_1_0_la_SOURCES += \
- pangocairo-fc.h
- endif
-
-+if HAVE_CAIRO_QUARTZ
- if HAVE_CORE_TEXT
- libpangocairo_1_0_la_SOURCES += \
- modules.h \
-@@ -351,6 +352,7 @@ libpangocairo_1_0_la_LIBADD += $(INCLUDED_CORE_TEXT_MODULES)
- # We don't have an CoreText GIR right now, so this is just hypothetical
- # PANGOCAIRO_FONT_BACKEND_GI_MODULE = PangoCoreText-1.0
- endif
-+endif
-
- pangocairo_introspection_files = \
- $(libpangocairo_1_0_la_SOURCES) \
Copied: trunk/dports/x11/pango-devel/files/patch-pango-Makefile.in.diff (from rev 97580, trunk/dports/x11/pango-devel/files/patch-pango-Makefile.am.diff)
===================================================================
--- trunk/dports/x11/pango-devel/files/patch-pango-Makefile.in.diff (rev 0)
+++ trunk/dports/x11/pango-devel/files/patch-pango-Makefile.in.diff 2012-09-09 17:18:11 UTC (rev 97589)
@@ -0,0 +1,66 @@
+Regenerated using:
+http://git.gnome.org/browse/pango/commit/?id=5859d32ccb52496148d969086a729b56a03c44e7
+--- pango/Makefile.in.orig 2012-09-04 21:00:26.000000000 -0500
++++ pango/Makefile.in 2012-09-09 12:13:41.000000000 -0500
+@@ -113,21 +113,21 @@
+ @HAVE_CAIRO_FREETYPE_TRUE@ pangocairo-fcfontmap.c \
+ @HAVE_CAIRO_FREETYPE_TRUE@ pangocairo-fc.h
+
+- at HAVE_CORE_TEXT_TRUE@am__append_24 = \
+- at HAVE_CORE_TEXT_TRUE@ modules.h \
+- at HAVE_CORE_TEXT_TRUE@ module-defs-coretext.c \
+- at HAVE_CORE_TEXT_TRUE@ pangocoretext.h \
+- at HAVE_CORE_TEXT_TRUE@ pangocoretext.c \
+- at HAVE_CORE_TEXT_TRUE@ pangocoretext-private.h \
+- at HAVE_CORE_TEXT_TRUE@ pangocoretext-fontmap.c \
+- at HAVE_CORE_TEXT_TRUE@ pangocairo-coretext.h \
+- at HAVE_CORE_TEXT_TRUE@ pangocairo-coretextfont.c \
+- at HAVE_CORE_TEXT_TRUE@ pangocairo-coretextfont.h \
+- at HAVE_CORE_TEXT_TRUE@ pangocairo-coretextfontmap.c
+-
+- at HAVE_CORE_TEXT_TRUE@am__append_25 = pangocoretext.h
+- at HAVE_CORE_TEXT_TRUE@am__append_26 = -framework CoreFoundation -framework ApplicationServices
+- at HAVE_CORE_TEXT_TRUE@am__append_27 = $(INCLUDED_CORE_TEXT_MODULES)
++ at HAVE_CAIRO_QUARTZ_TRUE@@HAVE_CORE_TEXT_TRUE at am__append_24 = \
++ at HAVE_CAIRO_QUARTZ_TRUE@@HAVE_CORE_TEXT_TRUE@ modules.h \
++ at HAVE_CAIRO_QUARTZ_TRUE@@HAVE_CORE_TEXT_TRUE@ module-defs-coretext.c \
++ at HAVE_CAIRO_QUARTZ_TRUE@@HAVE_CORE_TEXT_TRUE@ pangocoretext.h \
++ at HAVE_CAIRO_QUARTZ_TRUE@@HAVE_CORE_TEXT_TRUE@ pangocoretext.c \
++ at HAVE_CAIRO_QUARTZ_TRUE@@HAVE_CORE_TEXT_TRUE@ pangocoretext-private.h \
++ at HAVE_CAIRO_QUARTZ_TRUE@@HAVE_CORE_TEXT_TRUE@ pangocoretext-fontmap.c \
++ at HAVE_CAIRO_QUARTZ_TRUE@@HAVE_CORE_TEXT_TRUE@ pangocairo-coretext.h \
++ at HAVE_CAIRO_QUARTZ_TRUE@@HAVE_CORE_TEXT_TRUE@ pangocairo-coretextfont.c \
++ at HAVE_CAIRO_QUARTZ_TRUE@@HAVE_CORE_TEXT_TRUE@ pangocairo-coretextfont.h \
++ at HAVE_CAIRO_QUARTZ_TRUE@@HAVE_CORE_TEXT_TRUE@ pangocairo-coretextfontmap.c
++
++ at HAVE_CAIRO_QUARTZ_TRUE@@HAVE_CORE_TEXT_TRUE at am__append_25 = pangocoretext.h
++ at HAVE_CAIRO_QUARTZ_TRUE@@HAVE_CORE_TEXT_TRUE at am__append_26 = -framework CoreFoundation -framework ApplicationServices
++ at HAVE_CAIRO_QUARTZ_TRUE@@HAVE_CORE_TEXT_TRUE at am__append_27 = $(INCLUDED_CORE_TEXT_MODULES)
+
+ # ------------------- libpangowin32 -------------------
+ @HAVE_WIN32_TRUE at am__append_28 = pangowin32.h
+@@ -210,7 +210,7 @@
+ @HAVE_CAIRO_FREETYPE_TRUE at am__DEPENDENCIES_3 = \
+ @HAVE_CAIRO_FREETYPE_TRUE@ libpangoft2-$(PANGO_API_VERSION).la \
+ @HAVE_CAIRO_FREETYPE_TRUE@ $(am__DEPENDENCIES_1)
+- at HAVE_CORE_TEXT_TRUE@am__DEPENDENCIES_4 = $(am__DEPENDENCIES_1)
++ at HAVE_CAIRO_QUARTZ_TRUE@@HAVE_CORE_TEXT_TRUE at am__DEPENDENCIES_4 = $(am__DEPENDENCIES_1)
+ am__libpangocairo_1_0_la_SOURCES_DIST = pangocairo-context.c \
+ pangocairo-font.c pangocairo-fontmap.c pangocairo-render.c \
+ pangocairo-private.h pangocairo-win32font.c \
+@@ -227,10 +227,11 @@
+ @HAVE_CAIRO_WIN32_TRUE@ pangocairo-win32fontmap.lo
+ @HAVE_CAIRO_FREETYPE_TRUE at am__objects_3 = pangocairo-fcfont.lo \
+ @HAVE_CAIRO_FREETYPE_TRUE@ pangocairo-fcfontmap.lo
+- at HAVE_CORE_TEXT_TRUE@am__objects_4 = module-defs-coretext.lo \
+- at HAVE_CORE_TEXT_TRUE@ pangocoretext.lo pangocoretext-fontmap.lo \
+- at HAVE_CORE_TEXT_TRUE@ pangocairo-coretextfont.lo \
+- at HAVE_CORE_TEXT_TRUE@ pangocairo-coretextfontmap.lo
++ at HAVE_CAIRO_QUARTZ_TRUE@@HAVE_CORE_TEXT_TRUE at am__objects_4 = module-defs-coretext.lo \
++ at HAVE_CAIRO_QUARTZ_TRUE@@HAVE_CORE_TEXT_TRUE@ pangocoretext.lo \
++ at HAVE_CAIRO_QUARTZ_TRUE@@HAVE_CORE_TEXT_TRUE@ pangocoretext-fontmap.lo \
++ at HAVE_CAIRO_QUARTZ_TRUE@@HAVE_CORE_TEXT_TRUE@ pangocairo-coretextfont.lo \
++ at HAVE_CAIRO_QUARTZ_TRUE@@HAVE_CORE_TEXT_TRUE@ pangocairo-coretextfontmap.lo
+ am_libpangocairo_1_0_la_OBJECTS = $(am__objects_1) $(am__objects_2) \
+ $(am__objects_3) $(am__objects_4)
+ libpangocairo_1_0_la_OBJECTS = $(am_libpangocairo_1_0_la_OBJECTS)
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120909/874fb2a4/attachment.html>
More information about the macports-changes
mailing list