New pango1-xft2-ft219 INFO file – and PATCH
Peter Dyballa <[email protected]> Mon, 27 Feb 2012 17:38:57 +0100
| Newsgroups | gmane.os.apple.fink.gnome |
|---|---|
| Message-ID | <[email protected]> |
--Apple-Mail-4--133780975 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset=windows-1252 Hello! I am trying to set up a new INFO file for ImageMagick. Its recent = version, 6.7.5-6, needs a more up-to-date version of PANGO, at least = 1.28.1. PANGO 1.28.4 creates a new problem: it needs GLip 2.24 (and = recent PANGO 1.29.x might need much more updates). So I set up a new = INFO file for pango1-xft2-ft219, based on PANGO 1.28.3. I also checked a = few bug reports and seems that two are resolved and the problem with = '-I<SPACE>' is also past. So I commented and deleted some lines at the = end of the DescPackaging block. One bug seems to persist, the one in = modules/basic, where one set of C flags comes too early. I have a bug, https://bugzilla.gnome.org/show_bug.cgi?id=3D670891, with = 'make check'. The ConfigureParams received an update, --disable-silent-rules, in order = to get more information from make. I have a problem with the line in the PatchScript involving Perl =96 I = commented it applied the patches directly. LDFLAGS and CFLAGS are a bit = augmented to accelerate build and produce valuable information. The = build succeeds on intel (Sandy Bridge) Mac OS X 10.6.8 with 'fink -vm = --build-as-nobody rebuild pango1-xft2-ft219-shlibs pango1-xft2-ft219-dev = pango1-xft2-ft219' in one thread or in parallel. When installed = ImageMagick builds with this installed version of PANGO. I'm going to test on PPC (G4, 7447A) on Mac OS X 10.5.8. Some time later = I'll probably boot Tiger (10.4.11) and see what is building. --Apple-Mail-4--133780975 Content-Disposition: attachment; filename=pango1-xft2-ft219.info Content-Type: application/octet-stream; name="pango1-xft2-ft219.info" Content-Transfer-Encoding: 7bit Package: pango1-xft2-ft219 Version: 1.28.3 # configure:18111: checking pkg-config is at least version 0.9.0 # configure:18132: $PKG_CONFIG --exists --print-errors "fontconfig >= 2.5.0" # configure:18299: $PKG_CONFIG --exists --print-errors "xft >= 2.0.0 xrender" # configure:18981: $PKG_CONFIG --exists --print-errors "gobject-introspection-1.0 >= 0.9.5" # configure:19580: $PKG_CONFIG --exists --print-errors "gtk-doc >= 1.0" Revision: 1 Description: GTK+ - i18n libs (for freetype >= 2.1.9) License: LGPL Maintainer: The Gnome Core Team <[email protected]> Depends: << %N-shlibs (= %v-%r), cairo-shlibs (>= 1.8.8-3), dpkg-base-files, fontconfig2-shlibs (>= 2.8.0-4), freetype219-shlibs (>= 2.3.12-1), glib2-shlibs (>= 2.22.0-1), x11-shlibs, xft2-shlibs (>= 2.1.14-1) << BuildDepends: << cairo (>= 1.8.8-3), fink (>= 0.24.12-1), fink-package-precedence, fontconfig2-dev (>= 2.8.0-4), freetype219 (>= 2.3.12-1), glib2-dev (>= 2.22.0-1), glitz, gtk-doc (>= 1.8-1), libthai-dev (>= 0.1.12-1), pixman (>= 0.16.0-1), pkgconfig (>= 0.23), x11-dev, xft2-dev (>= 2.1.14-1) << Source: mirror:gnome:sources/pango/1.28/pango-%v.tar.bz2 Source-MD5: caa74baea47e7e16bc73c89f9089d522 # 8f3eaab506f613dd25bb1fa65ea87a145d523d066d90c227bdb3016523451bc2 pango-1.28.1.tar.bz2 bab5b4eb3fde6b0a5bfe98d25e668741 # 5e278bc9430cc7bb00270f183360d262c5006b51248e8b537ea904573f200632 pango-1.28.3.tar.bz2 caa74baea47e7e16bc73c89f9089d522 # 7eb035bcc10dd01569a214d5e2bc3437de95d9ac1cfa9f50035a687c45f05a9f pango-1.28.4.tar.bz2 3f3989700f04e9117d30544a9078b3a0 GLib 2.24 PatchFile: %n.patch PatchFile-MD5: 52f10af4f6eac9650c6ed48a6da69832 PatchScript: << #!/bin/bash -ev patch -p1 < %{PatchFile} perl -pi -e 's,(-dynamiclib)( +-single_module)*,$1 -single_module,g' configure # no need to patch aclocal.m4...causes regeneration of autotools #perl -pi -e 's,(-dynamiclib)( +-single_module)*,$1 -single_module,g' aclocal.m4 # SYSCONFDIR=%p/lib/pango-ft219/etc # perl -p -e 'BEGIN{$s=shift} s|\@SYSCONFDIR\@|$s|' $SYSCONFDIR <%{PatchFile} | patch -p1 sed -e 's|query|ft219-query|' update-pango-modules > update-pango-ft219-modules cat <<'END' >xrender.pc prefix=/usr/X11R6 exec_prefix=/usr/X11R6/bin libdir=/usr/X11R6/lib includedir=/usr/X11R6/include Name: Xrender Description: X Render Library Version: 0.8.4 Requires: Cflags: -I${includedir} Libs: -L${libdir} -lXrender -lX11 -lXext END << SetCPPFLAGS: -I%p/lib/fontconfig2/include SetLDFLAGS: -L%p/lib/fontconfig2/lib -no-undefined -bind_at_load -Wl,-t SetCFLAGS: -O0 -H ConfigureParams: --mandir=%p/share/man --enable-dependency-tracking --includedir=%p/lib/pango-ft219/include --libdir=%p/lib/pango-ft219/lib --sysconfdir=%p/lib/pango-ft219/etc --x-includes=/usr/X11R6/include --x-libraries=/usr/X11R6/lib --disable-explicit-deps --disable-silent-rules --enable-gtk-doc CompileScript: << #!/bin/bash -ev export PKG_CONFIG_PATH=%p/lib/glib-2.0/pkgconfig-strict:%p/lib/fontconfig2/lib/pkgconfig:%p/lib/xft2/lib/pkgconfig if [ `uname -r | cut -d. -f1` = 8 ]; then # apple x11 ships lib but no .pc on 10.4, so hack a local one PKG_CONFIG_PATH=%p/lib/glib-2.0/pkgconfig-strict:$PKG_CONFIG_PATH:`pwd` fi LD_TWOLEVEL_NAMESPACE=1 ac_cv_header_Carbon_Carbon_h=no ./configure %c make # make check fink-package-precedence --prohibit-bdep %n-dev . << InfoTest: << TestDepends: glib2-dev (>= 2.22.0-1), glib2-shlibs (>= 2.22.0-1) TestScript: make check XFAIL_TESTS=check.docs || exit 2 << InstallScript: << #!/bin/bash -ev make -j1 install DESTDIR=%d SYSCONFDIR=%i/lib/pango-ft219/etc mv %i/bin/pango-querymodules %i/bin/pango-ft219-querymodules mv %i/share/man/man1/pango-querymodules.1 %i/share/man/man1/pango-ft219-querymodules.1 install -d -m 755 %i/sbin install -c -m 755 update-pango-ft219-modules %i/sbin/ install -d -m 755 $SYSCONFDIR/pango # everything is buried in a private hierarchy... # now symlink from the default places # must not symlink dirs...risk of confusing dpkg pushd %i/lib/pango-ft219 # 1. clone actual directory structure # NB: will fail miserably if space in %i or %p # but fink hopelessly can't handle that anyway /usr/bin/find . -type d -print0 | /usr/bin/xargs -0 -n 1 -I" " mkdir -pv "%i/ " # 2. sylink the individual files /usr/bin/find . \( -type f -o -type l \) -print0 | /usr/bin/xargs -0 -n 1 -I" " ln -sv "%p/lib/pango-ft219/ " "%i/ " # adjust to emit paths pointing to the default places #must edit actual files...perl-pie replaces symlink #with actual file (!= acting through the symlink) perl -pi -e 's,%p/lib/pango-ft219,%p,g' lib/pkgconfig/* # lib/*.la #Scared of libtool! popd # only keep the main ld files, not all the underlying pieces # plugins, or support data pushd %i rm lib/libpango*-1.0.*.dylib rm -r lib/pango rm -r etc popd << DocFiles: AUTHORS COPYING ChangeLog HACKING NEWS README THANKS SplitOff: << Package: %N-shlibs Description: GTK+ - i18n text shared libraries (for freetype >= 2.1.9) Depends: << cairo-shlibs (>= 1.8.8-3), fontconfig2-shlibs (>= 2.8.0-4), freetype219-shlibs (>= 2.3.12-1), glib2-shlibs (>= 2.22.0-1), libthai-shlibs (>= 0.1.12-1), x11-shlibs, xft2-shlibs (>= 2.1.14-1) << DocFiles: AUTHORS COPYING ChangeLog HACKING NEWS README THANKS Files: << lib/pango-ft219/lib/libpango-1.0.*.dylib lib/pango-ft219/lib/libpangocairo-1.0.*.dylib lib/pango-ft219/lib/libpangoft2-1.0.*.dylib lib/pango-ft219/lib/libpangox-1.0.*.dylib lib/pango-ft219/lib/libpangoxft-1.0.*.dylib lib/pango-ft219/lib/pango << Shlibs: << %p/lib/pango-ft219/lib/libpango-1.0.0.dylib 2801.0.0 %n (>= 1.24.2-1) %p/lib/pango-ft219/lib/libpangocairo-1.0.0.dylib 2801.0.0 %n (>= 1.24.2-1) %p/lib/pango-ft219/lib/libpangoft2-1.0.0.dylib 2801.0.0 %n (>= 1.24.2-1) %p/lib/pango-ft219/lib/libpangox-1.0.0.dylib 2801.0.0 %n (>= 1.24.2-1) %p/lib/pango-ft219/lib/libpangoxft-1.0.0.dylib 2801.0.0 %n (>= 1.24.2-1) << << SplitOff2: << Package: %N-dev Description: GTK+ - i18n text development headers and libraries (for freetype >= 2.1.9) Depends: %N (= %v-%r), pkgconfig (>= 0.23) BuildDependsOnly: True Conflicts: pango1-dev, pango1-xft2-dev Replaces: pango1-dev, pango1-xft2-dev DocFiles: AUTHORS COPYING ChangeLog HACKING NEWS README THANKS Files: << lib/pango-ft219/include lib/pango-ft219/lib include lib/libpango* lib/pkgconfig share/gtk-doc << << PostInstScript: << if [ configure = "$1" ]; then update-pango-ft219-modules fi << PostRmScript: << case "$1" in purge) SYSCONFDIR=%p/lib/pango-ft219/etc rm -f $SYSCONFDIR/pango/pango.modules rmdir $SYSCONFDIR/pango || true ;; esac << ConfFiles: %p/lib/pango-ft219/etc/pango/pangox.aliases Homepage: http://www.pango.org DescDetail: << System for layout and rendering of internationalized text. These packages link against fink's freetype219 instead of the freetype that comes as part of x11. They also have cairo support. << DescUsage: << Packages which install pango module(s) should call update-pango-ft219-modules in their PostInstScript and PostRmScript to update the pango.modules file. The headers and libraries needed at build time are in %p/lib/pango-ft219/{include,lib}, and also (as of 1.22.0-3) in the normal places (%p/{include,lib}). << DescPort: << Instead of requiring xslt to build this package, we just manually patch the pregenerated manpage target that is included in the tarball. check uses some C++ but it doesn't leak out into the installed package << DescPackaging: << Need to use glib that has errno patches to avoid self-test failure. Minimize propagation of InheritedBuildDepends Make sure we get cairo-1.8 after pdf got re-enabled in it Disable atsui because it gives poor font display sometimes (not doing subpixel rendering?) See: http://bugzilla.gnome.org/show_bug.cgi?id=554740 Make sure fink-supplied library paths come before x11's. looks Make sure local -I come before global. See: solved http://bugzilla.gnome.org/show_bug.cgi?id=572529 looks Ignoring "uninitialized value in concatenation" during gtkdoc already processing. See: fixed http://bugzilla.gnome.org/show_bug.cgi?id=584952 Fix for new strictness in gtk-doc-1.17. See: http://bugs.gentoo.org/show_bug.cgi?id=357205 gtk-doc-1.18 is even stricter about...something...and newer-%v changes are too complex to backport a solution, so don't worry if documentation fails sanity-check << --Apple-Mail-4--133780975 Content-Disposition: attachment; filename=pango1-xft2-ft219.patch Content-Type: application/octet-stream; name="pango1-xft2-ft219.patch" Content-Transfer-Encoding: 7bit --- pango-1.28.1/modules/basic/Makefile.in.orig 2010-06-15 16:55:49.000000000 +0200 +++ pango-1.28.1/modules/basic/Makefile.in 2012-02-27 00:27:41.000000000 +0100 @@ -413,7 +413,7 @@ INCLUDES = -DG_LOG_DOMAIN=\"Pango\" -DPANGO_ENABLE_ENGINE \ $(PANGO_DEBUG_FLAGS) -I$(top_srcdir) -I$(top_srcdir)/pango \ - $(GLIB_CFLAGS) $(am__append_1) $(am__append_4) $(am__append_9) + $(GLIB_CFLAGS) $(am__append_4) $(am__append_1) $(am__append_9) moduledir = $(libdir)/pango/$(PANGO_MODULE_VERSION)/modules module_LTLIBRARIES = $(am__append_3) $(am__append_6) $(am__append_8) \ $(am__append_11) --- pango-1.28.3/docs/html/pango-Miscellaneous-Utilities.html.orig 2012-02-27 01:21:21.000000000 +0100 +++ pango-1.28.3/docs/html/pango-Miscellaneous-Utilities.html 2012-02-27 14:35:22.000000000 +0100 @@ -295,7 +295,7 @@ <pre class="programlisting"><span class="returnvalue">char</span> * pango_config_key_get (<em class="parameter"><code>const <span class="type">char</span> *key</code></em>);</pre> <p> Looks up a key in the Pango config database -(pseudo-win.ini style, read from $sysconfdir/pango/pangorc, +(pseudo-win.ini style, read from @SYSCONFDIR@/pango/pangorc, ~/.pangorc, and getenv (PANGO_RC_FILE).) </p> <div class="variablelist"><table border="0"> @@ -711,4 +711,4 @@ <hr> Generated by GTK-Doc V1.18</div> </body> -</html> \ No newline at end of file +</html> --- pango-1.28.3/docs/pango-querymodules.1.orig 2010-09-29 13:03:11.000000000 +0200 +++ pango-1.28.3/docs/pango-querymodules.1 2012-02-27 14:38:41.000000000 +0100 @@ -38,7 +38,7 @@ The Pango module path is specified by the key Pango/ModulesPath in the Pango config database, which is read from -\fIsysconfdir\fR/pango/pangorc, +\fI@SYSCONFDIR@\fR/pango/pangorc, ~/\&.pangorc and the file specified in the environment variable \fBPANGO_RC_FILE\fR\&. --- pango-1.28.3/docs/pango-querymodules.xml.orig 2010-02-09 13:06:28.000000000 +0100 +++ pango-1.28.3/docs/pango-querymodules.xml 2012-02-27 14:43:34.000000000 +0100 @@ -36,7 +36,7 @@ The Pango module path is specified by the key <literal>Pango/ModulesPath</literal> in the Pango config database, which is read from - <filename><replaceable>sysconfdir</replaceable>/pango/pangorc</filename>, + <filename><replaceable>@SYSCONFDIR@</replaceable>/pango/pangorc</filename>, <filename>~/.pangorc</filename> and the file specified in the environment variable <envar>PANGO_RC_FILE</envar>. </para> --- pango-1.28.1/update-pango-modules.orig 1970-01-01 01:00:00.000000000 +0100 +++ pango-1.28.1/update-pango-modules 2012-02-27 00:47:37.000000000 +0100 @@ -0,0 +1,20 @@ +#!/bin/sh -e +# +# update-pango-modules +# +# Packages which install pango module(s) should call update-pango-modules +# in their PostInstScript and PostRmScript to update the pango.module file. +# + +CONFDIR=@SYSCONFDIR@/pango +CONFFILE=$CONFDIR/pango.modules + +mkdir -p $CONFDIR + +TMPFILE=`tempfile` +pango-querymodules >$TMPFILE + +mv -f $TMPFILE $CONFFILE +chmod 0644 $CONFFILE + +exit 0 --Apple-Mail-4--133780975 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset=us-ascii -- Greetings Pete <] o __o |__ o HPV, the real ___o /I -\<, |o \ -\),-% high speed! ___/\ /\___./ \___...O/ O____.....`-O-'-()--o_________________ --Apple-Mail-4--133780975 Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline ------------------------------------------------------------------------------ Try before you buy = See our experts in action! The most comprehensive online learning library for Microsoft developers is just $99.99! Visual Studio, SharePoint, SQL - plus HTML5, CSS3, MVC3, Metro Style Apps, more. Free future releases when you subscribe now! http://p.sf.net/sfu/learndevnow-dev2 --Apple-Mail-4--133780975 Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ fink-gnome-core mailing list [email protected] List archive: http://news.gmane.org/gmane.os.apple.fink.gnome Subscription management: https://lists.sourceforge.net/lists/listinfo/fink-gnome-core --Apple-Mail-4--133780975--