Update of /cvsroot/fink/dists/10.2/unstable/main/finkinfo/gnome
In directory usw-pr-cvs1:/tmp/cvs-serv18630/gnome
Added Files:
atk1-1.0.2-1.info bonobo-1.0.20-2.info bonobo-1.0.20-2.patch
gnome-print-0.36-2.info gnome-print-0.36-2.patch
gtk+2-2.0.5-2.info gtk+2-2.0.5-2.patch pango1-1.0.3-2.info
pango1-1.0.3-2.patch
Log Message:
Fixing a developers mistakes
--- NEW FILE: atk1-1.0.2-1.info ---
Package: atk1
Version: 1.0.2
Revision: 1
Depends: %N-shlibs (= %v-%r)
BuildDepends: glib2-dev, gtk-doc, pkgconfig
Source: mirror:gnome:2.0.0/sources/atk/atk-%v.tar.bz2
SetCPPFLAGS: -no-cpp-precomp
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
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: bonobo-1.0.20-2.info ---
Package: bonobo
Version: 1.0.20
Revision: 2
Source: mirror:gnome:stable/sources/%n/%n-%v.tar.bz2
Source-MD5: c4c586e2f8670a0adf6116f9b7e6e496
Depends: %N-shlibs (= %v-%r)
BuildDepends: gdk-pixbuf, freetype2, libjpeg, libpng, libtiff, netpbm, audiofile,
esound, glib, gtk+, readline, giflib, imlib, gnome-libs-dev, gnome-print-dev, oaf-dev,
libxml, popt, libglade
SetCPPFLAGS: -no-cpp-precomp -DORBIT_DEF_CORBA_sequence_CORBA_string
-DTC_DEF_TC_CORBA_sequence_CORBA_string
Patch: %f.patch
UpdatePoMakefile: true
InstallScript: make install DESTDIR=%d
SplitOff: <<
Package: %N-shlibs
Depends: gnome-libs, oaf (>=0.6.7), gnome-print (>= 0.35), libxml (>= 1.8.15), orbit
(>= 0.5.12), gettext (>= 0.10.40-2)
Replaces: %N (<= 1.0.19-1)
Files: lib/libbonobo*.*.dylib lib/libefs.*.dylib
DocFiles: AUTHORS COPYING* ChangeLog NEWS README TODO
<<
SplitOff2: <<
Package: %N-dev
BuildDependsOnly: True
Depends: %N-shlibs (= %v-%r)
Replaces: %N (<= 1.0.20-2)
Files: include lib/lib*.dylib lib/*.a lib/*.la lib/*.sh
DocFiles: AUTHORS COPYING* ChangeLog NEWS README TODO
<<
DocFiles: AUTHORS COPYING* ChangeLog NEWS README TODO
Description: Library for compound documents in GNOME
DescDetail: <<
Bonobo is a library that provides the necessary framework for GNOME
applications to deal with compound documents, i.e. those with a
spreadsheet and graphic embedded in a word-processing document.
<<
DescPort: <<
This patch does:
- Add -module libtool flag to storage-modules.
- Workaround of remove(3) bug.
- Enable shared libraries on Mac OS X 10.1.
<<
License: GPL/LGPL
Maintainer: Masanori Sekino <[EMAIL PROTECTED]>
Homepage: http://www.gnome.org/
--- NEW FILE: bonobo-1.0.20-2.patch ---
diff -Naur bonobo-1.0.20.old/Makefile.in bonobo-1.0.20.new/Makefile.in
--- bonobo-1.0.20.old/Makefile.in Fri Apr 12 00:17:56 2002
+++ bonobo-1.0.20.new/Makefile.in Sun May 19 14:54:54 2002
@@ -166,7 +166,7 @@
NULL =
-SUBDIRS = macros intl idl
libefs bonobo storage-modules
monikers components samples
gshell tests doc po
+SUBDIRS = macros intl idl
+ libefs bonobo storage-modules
+ monikers components samples
+gshell doc po
confexecdir = $(libdir)
diff -Naur bonobo-1.0.20.old/configure bonobo-1.0.20.new/configure
--- bonobo-1.0.20.old/configure Fri Apr 12 00:10:55 2002
+++ bonobo-1.0.20.new/configure Wed Jun 12 06:03:38 2002
@@ -5533,11 +5533,11 @@
;;
darwin* | rhapsody*)
- allow_undefined_flag='-undefined suppress'
+ allow_undefined_flag='-flat_namespace -undefined suppress'
# 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='$CC $(test .$module = .yes && echo -bundle || echo -dynamiclib)
$allow_undefined_flag -o $lib $libobjs $deplibs$linkopts -install_name $rpath/$soname
$(test -n "$verstring" -a x$verstring != x0.0 && echo $verstring)'
+ archive_cmds='$CC $(test .$module = .yes && echo -bundle || echo -dynamiclib)
+$allow_undefined_flag -o $lib $libobjs $deplibs$linkopts $(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
diff -Naur bonobo-1.0.20.old/libefs/configure bonobo-1.0.20.new/libefs/configure
--- bonobo-1.0.20.old/libefs/configure Fri Apr 12 00:11:03 2002
+++ bonobo-1.0.20.new/libefs/configure Tue Jun 4 21:10:28 2002
@@ -4553,11 +4553,11 @@
;;
darwin* | rhapsody*)
- allow_undefined_flag='-undefined suppress'
+ allow_undefined_flag='-flat_namespace -undefined suppress'
# 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='$CC $(test .$module = .yes && echo -bundle || echo -dynamiclib)
$allow_undefined_flag -o $lib $libobjs $deplibs$linkopts -install_name $rpath/$soname
$(test -n "$verstring" -a x$verstring != x0.0 && echo $verstring)'
+ archive_cmds='$CC $(test .$module = .yes && echo -bundle || echo -dynamiclib)
+$allow_undefined_flag -o $lib $libobjs $deplibs$linkopts -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
diff -Naur bonobo-1.0.20.old/ltmain.sh bonobo-1.0.20.new/ltmain.sh
--- bonobo-1.0.20.old/ltmain.sh Fri Apr 12 00:10:55 2002
+++ bonobo-1.0.20.new/ltmain.sh Thu May 30 21:39:32 2002
@@ -1727,7 +1727,7 @@
if test "$installed" = no; then
notinst_deplibs="$notinst_deplibs $lib"
- need_relink=yes
+ # need_relink=yes
fi
if test -n "$old_archive_from_expsyms_cmds"; then
@@ -2888,6 +2888,11 @@
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
eval cmds=\"$archive_cmds\"
fi
IFS="${IFS= }"; save_ifs="$IFS"; IFS='~'
diff -Naur bonobo-1.0.20.old/storage-modules/bonobo-storage-fs.c
bonobo-1.0.20.new/storage-modules/bonobo-storage-fs.c
--- bonobo-1.0.20.old/storage-modules/bonobo-storage-fs.c Tue Sep 25 01:21:33
2001
+++ bonobo-1.0.20.new/storage-modules/bonobo-storage-fs.c Sun May 19 14:55:09
+2002
@@ -329,11 +329,15 @@
CORBA_Environment *ev)
{
BonoboStorageFS *storage_fs = BONOBO_STORAGE_FS (storage);
+ struct stat st;
char *full;
full = g_concat_dir_and_file (storage_fs->path, path);
- if (remove (full) == -1) {
+ /* remove() on Mac OS X(10.0.4) does not remove a directory. */
+ /* if (remove (full) == -1) { */
+ stat (full, &st);
+ if ((S_ISDIR(st.st_mode) ? rmdir (full) : unlink (full)) == -1) {
if (errno == ENOENT)
CORBA_exception_set (ev, CORBA_USER_EXCEPTION,
--- NEW FILE: gnome-print-0.36-2.info ---
Package: gnome-print
Version: 0.36
Revision: 2
Source: mirror:gnome:stable/sources/%n/%n-%v.tar.bz2
Source-MD5: 4c31cf6e64bb46b50dee08a9e378cc25
BuildDepends: audiofile, esound, glib, gtk+, libjpeg, libpng, libtiff, netpbm, orbit,
readline, imlib, gnome-libs-dev, libxml, libglade
Depends: %N-shlibs (= %v-%r)
PatchScript: sed -e 's|<PREFIX>|%p|g' <%a/%f.patch | patch -p1
UpdatePoMakefile: true
SetCFLAGS: -O2 -no-cpp-precomp
CompileScript: <<
./configure %c
make
nm libgnomeprint/.libs/libgnomeprint.dylib | egrep ' [DTS] (_g_utf|_g_unichar)' | sed
's/.* //' | sort | uniq >symbol.list
nmedit -R symbol.list libgnomeprint/.libs/libgnomeprint.15.1.11.dylib
<<
InstallScript: <<
make install DESTDIR=%d
install -c -m 644 run-gnome-font-install %i/share/fonts
(cd fonts; install -c -m 644 *.font %i/share/fonts)
<<
PostInstScript: <<
perl %p/share/fonts/run-gnome-font-install %p/bin/gnome-font-install %p/share %p/share
<<
SplitOff: <<
Package: %N-shlibs
Depends: gdk-pixbuf (>= 0.16), libxml, libglade, freetype2 (>= 2.0.8-3)
Replaces: %N (<= 0.35-2)
Files: lib/libgnomeprint.*.dylib
DocFiles: AUTHORS COPYING* ChangeLog NEWS README
<<
SplitOff2: <<
Package: %N-dev
BuildDependsOnly: True
Depends: %N-shlibs (= %v-%r)
Replaces: %N (<< 0.36-2)
Files: include lib/libgnomeprint.* lib/*.sh
DocFiles: AUTHORS COPYING* ChangeLog NEWS README
<<
DocFiles: AUTHORS COPYING* ChangeLog NEWS README
Description: Gnome Print - Printing libraries for GNOME.
DescDetail: <<
You should install the gnome-print package if you intend on using any of
the GNOME applications that can print. If you would like to develop GNOME
applications that can print you will also need to install the gnome-print
devel package.
<<
DescPort: <<
Symbols start with _g_utf8_ or _g_unichar_ may conflict with other library.
Uses nmedit to make them private extern symbol.
<<
License: GPL/LGPL
Maintainer: Masanori Sekino <[EMAIL PROTECTED]>
Homepage: http://www.gnome.org/
--- NEW FILE: gnome-print-0.36-2.patch ---
diff -Naur gnome-print-0.36.old/Makefile.in gnome-print-0.36.new/Makefile.in
--- gnome-print-0.36.old/Makefile.in Mon Jun 3 01:44:47 2002
+++ gnome-print-0.36.new/Makefile.in Sat Jun 8 17:48:30 2002
@@ -159,7 +159,7 @@
@LIBGPA_TRUE@LIBGPA_DIR = @LIBGPA_TRUE@libgpa data
@LIBGPA_FALSE@LIBGPA_DIR =
-SUBDIRS = intl po $(LIBGPA_DIR) libgnomeprint afms profiles fonts tests
$(INSTALLER_DIR)
+SUBDIRS = intl po $(LIBGPA_DIR) libgnomeprint afms profiles fonts $(INSTALLER_DIR)
INCLUDES = \
$(GTK_CFLAGS) \
@@ -207,7 +207,7 @@
TAR = gtar
GZIP_ENV = --best
DIST_SUBDIRS = intl po libgpa data libgnomeprint afms profiles fonts \
-tests installer
+installer
all: all-redirect
.SUFFIXES:
$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in
$(ACLOCAL_M4)
diff -Naur gnome-print-0.36.old/configure gnome-print-0.36.new/configure
--- gnome-print-0.36.old/configure Mon Jun 3 01:44:20 2002
+++ gnome-print-0.36.new/configure Sat Jun 8 21:15:06 2002
@@ -3440,11 +3440,11 @@
;;
darwin* | rhapsody*)
- allow_undefined_flag='-undefined suppress'
+ allow_undefined_flag='-undefined suppress -flat_namespace'
# 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='$CC $(test .$module = .yes && echo -bundle || echo -dynamiclib)
$allow_undefined_flag -o $lib $libobjs $deplibs$linkopts -install_name $rpath/$soname
$(test -n "$verstring" -a x$verstring != x0.0 && echo $verstring)'
+ archive_cmds='$CC $(test .$module = .yes && echo -bundle || echo -dynamiclib)
+$allow_undefined_flag -o $lib $libobjs $deplibs$linkopts -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
diff -Naur gnome-print-0.36.old/libgnomeprint/gnome-print-pclc.c
gnome-print-0.36.new/libgnomeprint/gnome-print-pclc.c
--- gnome-print-0.36.old/libgnomeprint/gnome-print-pclc.c Sun Jul 23 04:59:09
2000
+++ gnome-print-0.36.new/libgnomeprint/gnome-print-pclc.c Sat Jun 8 17:48:30
+2002
@@ -16,6 +16,8 @@
4. The application and the print dialog will load the
job specific parameters */
+PCLJobData * jobdata;
+
void
pclc_new_job_data (void)
{
diff -Naur gnome-print-0.36.old/libgnomeprint/gnome-print-pclr.c
gnome-print-0.36.new/libgnomeprint/gnome-print-pclr.c
--- gnome-print-0.36.old/libgnomeprint/gnome-print-pclr.c Fri May 25 05:35:07
2001
+++ gnome-print-0.36.new/libgnomeprint/gnome-print-pclr.c Sat Jun 8 17:48:30
+2002
@@ -62,7 +62,6 @@
#include <libgnomeprint/gnome-print-encode.h>
#include <libgnomeprint/gnome-print-encode-private.h>
-PCLJobData * jobdata;
static GnomePrintRGBPClass *pclr_parent_class;
static int
diff -Naur gnome-print-0.36.old/libgnomeprint/gnome-print-pclv.c
gnome-print-0.36.new/libgnomeprint/gnome-print-pclv.c
--- gnome-print-0.36.old/libgnomeprint/gnome-print-pclv.c Fri May 25 05:35:07
2001
+++ gnome-print-0.36.new/libgnomeprint/gnome-print-pclv.c Sat Jun 8 17:48:30
+2002
@@ -53,7 +53,6 @@
#include <libgnomeprint/gnome-print-pclc.h>
#include <libgnomeprint/gnome-print-encode-private.h>
-PCLJobData * jobdata;
static GnomePrintRGBPClass *pclv_parent_class;
static int
diff -Naur gnome-print-0.36.old/ltmain.sh gnome-print-0.36.new/ltmain.sh
--- gnome-print-0.36.old/ltmain.sh Mon Jun 3 01:44:16 2002
+++ gnome-print-0.36.new/ltmain.sh Sat Jun 8 18:17:19 2002
@@ -2858,6 +2858,11 @@
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
eval cmds=\"$archive_cmds\"
fi
IFS="${IFS= }"; save_ifs="$IFS"; IFS='~'
diff -Naur gnome-print-0.36.old/run-gnome-font-install
gnome-print-0.36.new/run-gnome-font-install
--- gnome-print-0.36.old/run-gnome-font-install Tue Jan 15 00:43:06 2002
+++ gnome-print-0.36.new/run-gnome-font-install Sat Jun 8 17:48:30 2002
@@ -10,7 +10,7 @@
my $datadir = $ARGV[1];
my $srcdir = $ARGV[2];
my $sysconfdir = $ARGV[3];
-if (!$sysconfdir) {$sysconfdir="/etc";}
+if (!$sysconfdir) {$sysconfdir="<PREFIX>/etc";}
die "Error: installer not executable.\n" unless -f $installer && -x $installer;
die "Error: datadir is not a directory.\n" unless -d $datadir;
@@ -26,6 +26,10 @@
'/usr/local/lib/ghostscript/fonts',
'/usr/local/share/fonts/default/Type1',
'/usr/local/share/fonts/default/ghostscript',
+ '<PREFIX>/share/ghostscript/fonts',
+ '<PREFIX>/lib/ghostscript/fonts',
+ '<PREFIX>/share/fonts/default/Type1',
+ '<PREFIX>/share/fonts/default/ghostscript',
'/usr/share/ghostscript/fonts',
'/usr/freeware/share/ghostscript/fonts'
);
@@ -148,7 +152,13 @@
'/usr/lib/texmf/fonts/type1/omega',
'/usr/share/texmf/fonts/afm',
'/usr/share/texmf/fonts/type1/adobe',
- '/usr/share/texmf/fonts/type1/omega'
+ '/usr/share/texmf/fonts/type1/omega',
+ '<PREFIX>/lib/texmf/fonts/afm',
+ '<PREFIX>/lib/texmf/fonts/type1/adobe',
+ '<PREFIX>/lib/texmf/fonts/type1/omega',
+ '<PREFIX>/share/texmf/fonts/afm',
+ '<PREFIX>/share/texmf/fonts/type1/adobe',
+ '<PREFIX>/share/texmf/fonts/type1/omega'
);
print "Info: running \"$installer ", join (' ', @options), "\".\n";
system ($installer, @options);
--- NEW FILE: gtk+2-2.0.5-2.info ---
Package: gtk+2
Version: 2.0.5
Revision: 2
Depends: %N-shlibs (= %v-%r), %N-dev (= %v-%r)
Replaces: %N-common
Conflicts: %N-common
BuildDepends: freetype2 (>= 2.0.8-3), glib2-dev (>= 2.0.1), atk1 (>= 1.0.1),
pango1-dev (>= 1.0.1), libpng, libjpeg, libtiff, pkgconfig, gtk-doc
Source: mirror:gnome:2.0.0/sources/gtk+/gtk+-%v.tar.bz2
Source-MD5: dfa52595e76fd389c4d42c60412317e8
Patch: %f.patch
NoSetLDFLAGS: true
SetCPPFLAGS: -no-cpp-precomp
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.1), 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/
DocFiles: AUTHORS COPYING ChangeLog NEWS README TODO
<<
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.5-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.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: OSDN - Tired of that same old
cell phone? Get a new here for FREE!
https://www.inphonic.com/r.asp?r=sourceforge1&refcode1=vs3390
_______________________________________________
Fink-commits mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/fink-commits
