Update of /cvsroot/fink/packages/dists/unstable/main/finkinfo/gnome
In directory usw-pr-cvs1:/tmp/cvs-serv13047

Added Files:
        pango1-1.0.3-2.info pango1-1.0.3-2.patch 
Log Message:
Fix for Jaguar. Applied patch from Ben Hines.

--- NEW FILE: pango1-1.0.3-2.info ---
Package: pango1
Version: 1.0.3
Revision: 2
Depends: %N-shlibs (=%v-%r), %N-dev (=%v-%r)
BuildDepends: freetype2 (>= 2.0.8-3), glib2-dev, gtk-doc, pkgconfig
Provides: %N-bin, %N-common
Replaces: %N-bin, %N-common
Source: mirror:gnome:2.0.0/sources/pango/pango-%v.tar.bz2
Source-MD5: 5bb1904c4a7837ec5b8007501646302d
Patch: %f.patch
NoSetCPPFLAGS: true
NoSetLDFLAGS: true
SetCPPFLAGS: -no-cpp-precomp
SetLIBS: -L%p/lib
InstallScript: <<
  make install DESTDIR=%d
  LANG=C DYLD_LIBRARY_PATH=%b/pango/.libs %i/bin/pango-querymodules 
%i/lib/pango/1.0.0/modules/* | sed -e 's|%i|%p|g' >%i/etc/pango/pango.modules
<<
BuildDependsOnly: True
SplitOff: <<
  Package: %N-shlibs
  Depends: freetype2-shlibs, glib2
  Files: lib/lib*-1.0.*.dylib lib/pango
  DocFiles: AUTHORS COPYING ChangeLog NEWS README TODO
<<
SplitOff2: <<
  Package: %N-dev
  Depends: %N-shlibs (=%v-%r)
  Replaces: %N (<< 1.0.1-4)
  Files: include lib/lib*-1.0.* lib/pkgconfig share/gtk-doc
  DocFiles: AUTHORS COPYING ChangeLog NEWS README TODO
<<
DocFiles: AUTHORS COPYING ChangeLog NEWS README TODO
Description: System for Layout and rendering of internationalized text
DescDetail: System for layout and rendering of internationalized text.
License: LGPL
Maintainer: Masanori Sekino <[EMAIL PROTECTED]>
Homepage: http://www.pango.org

--- NEW FILE: pango1-1.0.3-2.patch ---
diff -Naur pango-1.0.3.old/Makefile.in pango-1.0.3.new/Makefile.in
--- pango-1.0.3.old/Makefile.in Fri Jun 14 06:04:40 2002
+++ pango-1.0.3.new/Makefile.in Wed Jul 31 22:22:31 2002
@@ -116,7 +116,7 @@
 YACC = @YACC@
 ms_librarian = @ms_librarian@
 
-SUBDIRS = pango modules examples docs tools tests
+SUBDIRS = pango modules docs tools
 
 EXTRA_DIST = \
        pango.spec.in   \
diff -Naur pango-1.0.3.old/configure pango-1.0.3.new/configure
--- pango-1.0.3.old/configure   Fri Jun 14 06:04:03 2002
+++ pango-1.0.3.new/configure   Wed Jul 31 22:19:15 2002
@@ -5521,7 +5521,7 @@
     # FIXME: Relying on posixy $() will cause problems for
     #        cross-compilation, but unfortunately the echo tests do not
     #        yet detect zsh echo's removal of \ escapes.
-    archive_cmds='$nonopt $(test "x$module" = xyes && echo -bundle || echo 
-dynamiclib) $allow_undefined_flag -o $lib $libobjs $deplibs$linker_flags 
-install_name $rpath/$soname $verstring'
+    archive_cmds='$nonopt $(test x$module = xyes && echo -bundle || echo -dynamiclib) 
+$allow_undefined_flag -o $lib $libobjs $deplibs$linker_flags $(test .$module != .yes 
+&& echo -install_name $rpath/$soname $tmp_verstring)'
     # We need to add '_' to the symbols in $export_symbols first
     #archive_expsym_cmds="$archive_cmds"' && strip -s $export_symbols'
     hardcode_direct=yes
@@ -9352,7 +9352,7 @@
 
   if $have_freetype ; then
     pango_save_cppflags="$CPPFLAGS"
-    CPPFLAGS="$CPPFLAGS $FREETYPE_CFLAGS"
+    CPPFLAGS="$FREETYPE_CFLAGS $CPPFLAGS"
 
     echo "$as_me:$LINENO: checking For sufficiently new FreeType (at least 2.0.1)" >&5
 echo $ECHO_N "checking For sufficiently new FreeType (at least 2.0.1)... $ECHO_C" >&6
@@ -9422,7 +9422,7 @@
 
 ## see which freetype we have, 2.0.3 vs. 2.0.4
 pango_save_cppflags="$CPPFLAGS"
-CPPFLAGS="$CPPFLAGS $FREETYPE_CFLAGS"
+CPPFLAGS="$FREETYPE_CFLAGS $CPPFLAGS"
 if test "${ac_cv_header_freetype_internal_tterrors_h+set}" = set; then
   echo "$as_me:$LINENO: checking for freetype/internal/tterrors.h" >&5
 echo $ECHO_N "checking for freetype/internal/tterrors.h... $ECHO_C" >&6
@@ -9624,7 +9624,7 @@
 if test $have_x = true ; then
   if test $have_freetype = true ; then
     pango_save_cppflags="$CPPFLAGS"
-    CPPFLAGS="$CPPFLAGS $FREETYPE_CFLAGS"
+    CPPFLAGS="$X_CFLAGS $FREETYPE_CFLAGS $CPPFLAGS"
 
     echo "$as_me:$LINENO: checking for XRenderFindFormat in -lXrender" >&5
 echo $ECHO_N "checking for XRenderFindFormat in -lXrender... $ECHO_C" >&6
diff -Naur pango-1.0.3.old/ltmain.sh pango-1.0.3.new/ltmain.sh
--- pango-1.0.3.old/ltmain.sh   Fri Apr 26 18:23:44 2002
+++ pango-1.0.3.new/ltmain.sh   Wed Jul 31 22:19:15 2002
@@ -2952,7 +2952,17 @@
        if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then
          eval cmds=\"$archive_expsym_cmds\"
        else
+         if test "x$verstring" = "x0.0"; then
+           tmp_verstring=
+         else
+           tmp_verstring="$verstring"
+         fi
+         save_deplibs="$deplibs"
+         for conv in $convenience; do
+           deplibs="${deplibs%$conv*} ${deplibs#*$conv}"
+         done
          eval cmds=\"$archive_cmds\"
+         deplibs="$save_deplibs"
        fi
        save_ifs="$IFS"; IFS='~'
        for cmd in $cmds; do
@@ -4006,10 +4016,10 @@
 
 # Directory that this library needs to be installed in:
 libdir='$install_libdir'"
-         if test "$installed" = no && test "$need_relink" = yes; then
-           $echo >> $output "\
-relink_command=\"$relink_command\""
-         fi
+#        if test "$installed" = no && test "$need_relink" = yes; then
+#          $echo >> $output "\
+#relink_command=\"$relink_command\""
+#        fi
        done
       fi
 
diff -Naur pango-1.0.3.old/modules/Makefile.in pango-1.0.3.new/modules/Makefile.in
--- pango-1.0.3.old/modules/Makefile.in Fri Jun 14 06:04:52 2002
+++ pango-1.0.3.new/modules/Makefile.in Wed Jul 31 22:19:15 2002
@@ -334,9 +334,11 @@
 
 
 install-data-local:
-       $(mkinstalldirs) $(DESTDIR)$(sysconfdir)/pango &&       \
-       $(top_builddir)/pango/pango-querymodules                \
-               > $(DESTDIR)$(sysconfdir)/pango/pango.modules
+       $(mkinstalldirs) $(DESTDIR)$(sysconfdir)/pango &&               \
+       $(top_builddir)/pango/pango-querymodules                        \
+         $(DESTDIR)$(libdir)/pango/$(PANGO_MODULE_VERSION)/modules/*   \
+         | sed -e 's|^$(DESTDIR)||g'                                   \
+         > $(DESTDIR)$(sysconfdir)/pango/pango.modules 2>/dev/null
 
 included-modules:
        @for d in $(SUBDIRS) ; do \
diff -Naur pango-1.0.3.old/pango/Makefile.in pango-1.0.3.new/pango/Makefile.in
--- pango-1.0.3.old/pango/Makefile.in   Fri Jun 14 06:04:45 2002
+++ pango-1.0.3.new/pango/Makefile.in   Wed Jul 31 22:19:15 2002
@@ -249,7 +249,7 @@
 
 
 libpangoxft_1_0_la_LDFLAGS = -version-info $(LT_VERSION_INFO)
-libpangoxft_1_0_la_LIBADD = opentype/libpango-ot.la libpango-$(PANGO_API_VERSION).la 
$(INCLUDED_XFT_MODULES) $(XFT_LIBS) 
+libpangoxft_1_0_la_LIBADD = $(XFT_LIBS) opentype/libpango-ot.la 
+libpango-$(PANGO_API_VERSION).la $(INCLUDED_XFT_MODULES)
 libpangoxft_1_0_la_DEPENDENCIES = $(INCLUDED_XFT_MODULES) 
libpango-$(PANGO_API_VERSION).la
 
 libpangoft2_1_0_la_SOURCES = \



-------------------------------------------------------
This sf.net email is sponsored by: Dice - The leading online job board
for high-tech professionals. Search and apply for tech jobs today!
http://seeker.dice.com/seeker.epl?rel_code=31
_______________________________________________
Fink-commits mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/fink-commits

Reply via email to