Update of /cvsroot/fink/dists/10.2/stable/main/finkinfo/gnome
In directory sc8-pr-cvs1:/tmp/cvs-serv7710
Added Files:
atk1-1.0.3-2.info gtk+2-2.0.6-2.info gtk+2-2.0.6-2.patch
pango1-1.0.5-2.info pango1-1.0.5-2.patch
Log Message:
Moving from unstable based on positive feedback.
--- NEW FILE: atk1-1.0.3-2.info ---
Package: atk1
Version: 1.0.3
Revision: 2
Depends: %N-shlibs (= %v-%r)
BuildDepends: glib2-dev, gtk-doc (>= 0.9-4), pkgconfig, dlcompat-dev
Source: mirror:gnome:sources/atk/1.0/atk-%v.tar.bz2
Source-MD5: 9041396017f8207b8aa2bece27eb5ebb
SetCPPFLAGS: -no-cpp-precomp
SetCFLAGS: -O3 -funroll-loops -fstrict-aliasing
ConfigureParams: --enable-gtk-doc
CompileScript: <<
./configure %c
ulimit -s unlimited && make
<<
InstallScript: make install DESTDIR=%d
BuildDependsOnly: True
SplitOff: <<
Package: %N-shlibs
Depends: glib2
Files: lib/libatk-1.0.*.dylib
Shlibs: %p/lib/libatk-1.0.0.dylib 1.0.0 %n (>= 1.0.3-2)
DocFiles: AUTHORS COPYING ChangeLog NEWS README
<<
DocFiles: AUTHORS COPYING ChangeLog NEWS README
Description: Accessability Toolkit
DescDetail: <<
Handy library of accessability functions.
<<
License: LGPL
Maintainer: Masanori Sekino <[EMAIL PROTECTED]>
Homepage: http://www.gtk.org
--- NEW FILE: gtk+2-2.0.6-2.info ---
Package: gtk+2
Version: 2.0.6
Revision: 2
Depends: %N-shlibs (= %v-%r), %N-dev (= %v-%r)
Replaces: %N-common
Conflicts: %N-common
BuildDepends: freetype2 (>= 2.0.8-3) | freetype2-hinting (>= 2.0.8-3), glib2-dev (>=
2.0.6), atk1 (>= 1.0.1), pango1-dev (>= 1.0.1), libpng, libjpeg, libtiff, pkgconfig,
gtk-doc (>= 0.9-4), fink (>= 0.10.0), dlcompat-dev
Source: mirror:gnome:sources/gtk+/2.0/gtk+-%v.tar.bz2
Source-MD5: 5f9c1b54abea95408155045c661a5adf
Patch: %f.patch
NoSetLDFLAGS: true
SetCPPFLAGS: -no-cpp-precomp
SetCFLAGS: -O3 -funroll-loops -fstrict-aliasing
SetLIBS: -L%p/lib
ConfigureParams: --mandir=%p/share/man --disable-shm
CompileScript: <<
./configure %c
ulimit -s unlimited && make
<<
InstallScript: make install DESTDIR=%d
SplitOff: <<
Package: %N-shlibs
Depends: x11, glib2-shlibs (>= 2.0.6), atk1-shlibs (>= 1.0.1), pango1 (>= 1.0.1),
libpng-shlibs, libpng-shlibs, libtiff-shlibs
Files: lib/lib*-2.0.*.dylib lib/gtk-2.0/2.0.0/
Shlibs: <<
%p/lib/libgdk-x11-2.0.0.dylib 1.0.0 %n (>= 2.0.6-2)
%p/lib/libgdk_pixbuf-2.0.0.dylib 1.0.0 %n (>= 2.0.6-2)
%p/lib/libgdk_pixbuf_xlib-2.0.0.dylib 1.0.0 %n (>= 2.0.6-2)
%p/lib/libgtk-x11-2.0.0.dylib 1.0.0 %n (>= 2.0.6-2)
<<
DocFiles: AUTHORS COPYING ChangeLog NEWS README TODO
RunTimeVars: GDK_USE_XFT: 1
<<
SplitOff2: <<
Package: %N-dev
Depends: %N-shlibs (= %v-%r)
Replaces: %N (<< 2.0.2-2)
Conflicts: gtk+ (<< 1.2.10-12)
BuildDependsOnly: True
Files: include lib/gtk-2.0/include lib/lib*-2.0.* lib/pkgconfig share/aclocal
share/gtk-doc
DocFiles: AUTHORS COPYING ChangeLog NEWS README TODO
<<
ConfFiles: %p/etc/gtk-2.0/gtk.immodules
DocFiles: AUTHORS COPYING ChangeLog NEWS README TODO
Description: The Gimp Toolkit
DescDetail: <<
The X libraries originally written for the GIMP, which are now used by
several other programs as well.
<<
DescPort: <<
LDFLAGS and LIBS are modified for detecting freetype2 and xft.
gtk+2-dev conflicts with gtk+ (<< 1.2.11), because it has symbolic
link which intercepts include files of the package.
<<
License: LGPL
Maintainer: Masanori Sekino <[EMAIL PROTECTED]>
Homepage: http://www.gtk.org
--- NEW FILE: gtk+2-2.0.6-2.patch ---
diff -Naur gtk+-2.0.5.old/configure gtk+-2.0.5.new/configure
--- gtk+-2.0.5.old/configure Sun Jun 16 13:58:22 2002
+++ gtk+-2.0.5.new/configure Sun Jun 23 02:06:02 2002
@@ -5160,7 +5160,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 $verstring)'
# We need to add '_' to the symbols in $export_symbols first
#archive_expsym_cmds="$archive_cmds"' && strip -s $export_symbols'
hardcode_direct=yes
@@ -14483,7 +14483,7 @@
if $have_freetype ; then
gtk_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
diff -Naur gtk+-2.0.5.old/demos/gtk-demo/main.c gtk+-2.0.5.new/demos/gtk-demo/main.c
--- gtk+-2.0.5.old/demos/gtk-demo/main.c Fri May 17 04:00:25 2002
+++ gtk+-2.0.5.new/demos/gtk-demo/main.c Sun Jun 23 02:06:02 2002
@@ -96,7 +96,7 @@
{
int c;
-#ifndef G_OS_WIN32
+#ifdef HAVE_FLOCKFILE
c = getc_unlocked (stream);
#else
c = getc (stream);
diff -Naur gtk+-2.0.5.old/gdk/x11/gdkdrawable-x11.c
gtk+-2.0.5.new/gdk/x11/gdkdrawable-x11.c
--- gtk+-2.0.5.old/gdk/x11/gdkdrawable-x11.c Thu Apr 18 07:55:01 2002
+++ gtk+-2.0.5.new/gdk/x11/gdkdrawable-x11.c Sun Jun 23 02:06:02 2002
@@ -853,6 +853,7 @@
}
else
{
+ /* RGBA */
pf.direct.alpha = 0;
}
@@ -869,10 +870,18 @@
* RENDER's preferred order
*/
pf.direct.alphaMask = 0;
- /* ARGB */
- pf.direct.red = 16;
- pf.direct.green = 8;
- pf.direct.blue = 0;
+ if (ImageByteOrder (xdisplay) == LSBFirst)
+ {
+ /* ARGB */
+ pf.direct.red = 16;
+ pf.direct.green = 8;
+ pf.direct.blue = 0;
+ } else {
+ /* BGRA */
+ pf.direct.red = 8;
+ pf.direct.green = 16;
+ pf.direct.blue = 24;
+ }
*format = XRenderFindFormat (xdisplay,
(PictFormatType | PictFormatDepth |
@@ -884,7 +893,14 @@
0);
pf.direct.alphaMask = 0xff;
- pf.direct.alpha = 24;
+ if (ImageByteOrder (xdisplay) == LSBFirst)
+ {
+ /* ARGB */
+ pf.direct.alpha = 24;
+ } else {
+ /* BGRA */
+ pf.direct.alpha = 0;
+ }
*mask = XRenderFindFormat (xdisplay,
(PictFormatType | PictFormatDepth |
@@ -901,11 +917,19 @@
pf.type = PictTypeDirect;
pf.depth = 32;
- pf.direct.red = 16;
- pf.direct.green = 8;
- pf.direct.blue = 0;
+ if (ImageByteOrder (xdisplay) == LSBFirst)
+ {
+ pf.direct.red = 16;
+ pf.direct.green = 8;
+ pf.direct.blue = 0;
+ pf.direct.alpha = 24;
+ } else {
+ pf.direct.red = 8;
+ pf.direct.green = 16;
+ pf.direct.blue = 24;
+ pf.direct.alpha = 0;
+ }
pf.direct.alphaMask = 0xff;
- pf.direct.alpha = 24;
*format = XRenderFindFormat (xdisplay,
(PictFormatType | PictFormatDepth |
diff -Naur gtk+-2.0.5.old/ltmain.sh gtk+-2.0.5.new/ltmain.sh
--- gtk+-2.0.5.old/ltmain.sh Fri Apr 26 18:23:44 2002
+++ gtk+-2.0.5.new/ltmain.sh Sun Jun 23 02:06:02 2002
@@ -2952,7 +2952,12 @@
if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then
eval cmds=\"$archive_expsym_cmds\"
else
+ 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 +4011,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 gtk+-2.0.5.old/modules/input/Makefile.in
gtk+-2.0.5.new/modules/input/Makefile.in
--- gtk+-2.0.5.old/modules/input/Makefile.in Sun Jun 16 14:16:30 2002
+++ gtk+-2.0.5.new/modules/input/Makefile.in Sun Jun 23 02:06:02 2002
@@ -777,13 +777,13 @@
maintainer-clean-generic clean mostlyclean distclean maintainer-clean
-# Running this if DESTDIR is set is going to not work at all, so
-# skip it.
install-data-local:
- if [ -z "$(DESTDIR)" ] ; then \
- $(mkinstalldirs) $(DESTDIR)$(sysconfdir)/gtk-2.0 ; \
- $(top_builddir)/gtk/gtk-query-immodules-2.0 >
$(DESTDIR)$(sysconfdir)/gtk-2.0/gtk.immodules ; \
- fi
+ $(mkinstalldirs) $(DESTDIR)$(sysconfdir)/gtk-2.0 && \
+ $(top_builddir)/gtk/gtk-query-immodules-2.0 \
+ $(DESTDIR)$(moduledir)/* \
+ | sed -e 's|$(DESTDIR)||g' \
+ >$(DESTDIR)$(sysconfdir)/gtk-2.0/gtk.immodules \
+ 2>/dev/null
gtk.immodules: Makefile.am $(module_LTLIBRARIES)
$(top_builddir)/gtk/gtk-query-immodules-2.0 *.la > gtk.immodules
--- NEW FILE: pango1-1.0.5-2.info ---
Package: pango1
Version: 1.0.5
Revision: 2
Depends: %N-shlibs (=%v-%r), %N-dev (=%v-%r)
BuildDepends: freetype2 (>= 2.0.9-1) | freetype2-hinting (>= 2.0.9-1), glib2-dev,
gtk-doc (>= 0.9-4), pkgconfig, dlcompat-dev
Provides: %N-bin, %N-common
Replaces: %N-bin, %N-common
Source: mirror:gnome:sources/pango/1.0/pango-%v.tar.bz2
Source-MD5: e300e5c163bc28e180e45c8e20543b4b
PatchScript: sed 's|@PREFIX@|%p|' <%a/%f.patch | patch -p1
NoSetCPPFLAGS: true
NoSetLDFLAGS: true
SetCPPFLAGS: -no-cpp-precomp
SetCFLAGS: -O3 -funroll-loops -fstrict-aliasing
SetLIBS: -L%p/lib
InstallScript: <<
make install DESTDIR=%d
install -d -m 755 %i/sbin
install -c -m 755 update-pango-modules %i/sbin/
install -d -m 755 %i/etc/pango
install -c -m 644 examples/pangox.aliases %i/etc/pango/
<<
PostInstScript: <<
case "$1" in
configure)
update-pango-modules
;;
esac
<<
PostRmScript: <<
case "$1" in
purge)
rm -f %p/etc/pango/pango.modules
rmdir %p/etc/pango || true
;;
esac
<<
SplitOff: <<
Package: %N-shlibs
Depends: freetype2-shlibs (>= 2.0.9-1) | freetype2-hinting-shlibs (>= 2.0.9-1), glib2
Files: lib/lib*-1.0.*.dylib lib/pango
Shlibs: <<
%p/lib/libpango-1.0.0.dylib 1.0.0 %n (>= 1.0.4-3)
%p/lib/libpangoft2-1.0.0.dylib 1.0.0 %n (>= 1.0.4-3)
%p/lib/libpangox-1.0.0.dylib 1.0.0 %n (>= 1.0.4-3)
%p/lib/libpangoxft-1.0.0.dylib 1.0.0 %n (>= 1.0.4-3)
<<
DocFiles: AUTHORS COPYING ChangeLog NEWS README TODO
<<
SplitOff2: <<
Package: %N-dev
Depends: %N-shlibs (=%v-%r), x11
Replaces: %N (<< 1.0.1-4)
BuildDependsOnly: True
Files: include lib/lib*-1.0.* lib/pkgconfig share/gtk-doc
DocFiles: AUTHORS COPYING ChangeLog NEWS README TODO
<<
ConfFiles: %p/etc/pango/pangox.aliases
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.
DescPort: <<
If both xfree86 and freetype2 provides freetype library, libpangoxft and
libpangoft2 should use them respectively.
freetype2 (>= 2.0.9) provides two functions, FT_Get_First_Char and
FT_Get_Next_Char, but they are not provided by prior version. We have
system-xfree86 package and we don't know what version of freetype library
it provides. So, these functions are never used for libpangoxft.
<<
DescPackaging: <<
Package which install pango module(s) should call update-pango-modules in it's
PostInst/PostRm script to update pango.modules file.
Currently, uses example pangox.aliases without modification. For future, it
should be managed by font managing system like defoma (Debian font manager).
<<
License: LGPL
Maintainer: Masanori Sekino <[EMAIL PROTECTED]>
Homepage: http://www.pango.org
--- NEW FILE: pango1-1.0.5-2.patch ---
diff -Naur pango-1.0.5.old/Makefile.in pango-1.0.5.new/Makefile.in
--- pango-1.0.5.old/Makefile.in Mon Oct 14 01:50:47 2002
+++ pango-1.0.5.new/Makefile.in Sun Nov 24 06:33:34 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.5.old/configure pango-1.0.5.new/configure
--- pango-1.0.5.old/configure Mon Oct 14 01:41:22 2002
+++ pango-1.0.5.new/configure Sun Nov 24 06:33:34 2002
@@ -5522,7 +5522,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
@@ -9365,7 +9365,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
@@ -9435,7 +9435,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
diff -Naur pango-1.0.5.old/ltmain.sh pango-1.0.5.new/ltmain.sh
--- pango-1.0.5.old/ltmain.sh Tue Aug 20 10:13:37 2002
+++ pango-1.0.5.new/ltmain.sh Sun Nov 24 06:33:34 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.5.old/pango/Makefile.in pango-1.0.5.new/pango/Makefile.in
--- pango-1.0.5.old/pango/Makefile.in Mon Oct 14 01:50:48 2002
+++ pango-1.0.5.new/pango/Makefile.in Sun Nov 24 06:33:34 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 = \
diff -Naur pango-1.0.5.old/pango/pangoxft-font.c pango-1.0.5.new/pango/pangoxft-font.c
--- pango-1.0.5.old/pango/pangoxft-font.c Fri Aug 9 08:25:30 2002
+++ pango-1.0.5.new/pango/pangoxft-font.c Sun Nov 24 06:33:34 2002
@@ -544,7 +544,7 @@
face = pango_xft_font_get_face (font);
coverage = pango_coverage_new ();
-#ifdef HAVE_FT_GET_FIRST_CHAR
+#if 0 /* #ifdef HAVE_FT_GET_FIRST_CHAR */
{
FT_UInt gindex;
FT_ULong charcode;
diff -Naur pango-1.0.5.old/update-pango-modules pango-1.0.5.new/update-pango-modules
--- pango-1.0.5.old/update-pango-modules Thu Jan 1 09:00:00 1970
+++ pango-1.0.5.new/update-pango-modules Sun Nov 24 18:06:04 2002
@@ -0,0 +1,20 @@
+#!/bin/sh -e
+#
+# update-pango-modules
+#
+# Package which install pango module(s) should call update-pango-modules in
+# it's PostInstScript/PostRmScript to update pango.module file.
+#
+
+CONFDIR=@PREFIX@/etc/pango
+CONFFILE=$CONFDIR/pango.modules
+
+mkdir -p $CONFDIR
+
+TMPFILE=`tempfile`
+pango-querymodules >$TMPFILE
+
+mv -f $TMPFILE $CONFFILE
+chmod 0644 $CONFFILE
+
+exit 0
-------------------------------------------------------
This SF.net email is sponsored by: Microsoft Visual Studio.NET
comprehensive development tool, built to increase your
productivity. Try a free online hosted session at:
http://ads.sourceforge.net/cgi-bin/redirect.pl?micr0003en
_______________________________________________
Fink-commits mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/fink-commits
