You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
152 lines
6.7 KiB
152 lines
6.7 KiB
18 years ago
|
# --- T2-COPYRIGHT-NOTE-BEGIN ---
|
||
|
|
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
|
||
|
|
#
|
||
|
|
# T2 SDE: package/.../qtcurve/head.patch
|
||
|
|
# Copyright (C) 2004 - 2006 The T2 SDE Project
|
||
|
|
# Copyright (C) 1998 - 2004 Clifford Wolf
|
||
|
|
#
|
||
|
|
# More information can be found in the files COPYING and README.
|
||
|
|
#
|
||
|
|
# This patch file is dual-licensed. It is available under the license the
|
||
|
|
# patched project is licensed under, as long as it is an OpenSource license
|
||
|
|
# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
|
||
|
|
# of the GNU General Public License as published by the Free Software
|
||
|
|
# Foundation; either version 2 of the License, or (at your option) any later
|
||
|
|
# version.
|
||
|
|
# --- T2-COPYRIGHT-NOTE-END ---
|
||
|
|
|
||
|
|
diff -urN QtCurve-0.21.orig/acinclude.m4 QtCurve-0.21/acinclude.m4
|
||
|
|
--- QtCurve-0.21.orig/acinclude.m4 2004-02-16 17:14:15.000000000 -0500
|
||
|
|
+++ QtCurve-0.21/acinclude.m4 2004-05-16 21:12:21.000000000 -0400
|
||
|
|
@@ -9876,7 +9876,7 @@
|
||
|
|
# If the export-symbols file already is a .def file (1st line
|
||
|
|
# is EXPORTS), use it as is.
|
||
|
|
# If DATA tags from a recent dlltool are present, honour them!
|
||
|
|
- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='if test "x`head -1 $export_symbols`" = xEXPORTS; then
|
||
|
|
+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='if test "x`head -n 1 $export_symbols`" = xEXPORTS; then
|
||
|
|
cp $export_symbols $output_objdir/$soname-def;
|
||
|
|
else
|
||
|
|
echo EXPORTS > $output_objdir/$soname-def;
|
||
|
|
diff -urN QtCurve-0.21.orig/aclocal.m4 QtCurve-0.21/aclocal.m4
|
||
|
|
--- QtCurve-0.21.orig/aclocal.m4 2004-04-22 12:22:05.000000000 -0400
|
||
|
|
+++ QtCurve-0.21/aclocal.m4 2004-05-16 21:10:54.000000000 -0400
|
||
|
|
@@ -9854,7 +9854,7 @@
|
||
|
|
# If the export-symbols file already is a .def file (1st line
|
||
|
|
# is EXPORTS), use it as is.
|
||
|
|
# If DATA tags from a recent dlltool are present, honour them!
|
||
|
|
- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='if test "x`head -1 $export_symbols`" = xEXPORTS; then
|
||
|
|
+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='if test "x`head -n 1 $export_symbols`" = xEXPORTS; then
|
||
|
|
cp $export_symbols $output_objdir/$soname-def;
|
||
|
|
else
|
||
|
|
echo EXPORTS > $output_objdir/$soname-def;
|
||
|
|
diff -urN QtCurve-0.21.orig/admin/cvs.sh QtCurve-0.21/admin/cvs.sh
|
||
|
|
--- QtCurve-0.21.orig/admin/cvs.sh 2003-02-20 07:36:14.000000000 -0500
|
||
|
|
+++ QtCurve-0.21/admin/cvs.sh 2004-05-16 21:09:40.000000000 -0400
|
||
|
|
@@ -27,7 +27,7 @@
|
||
|
|
|
||
|
|
check_autotool_versions()
|
||
|
|
{
|
||
|
|
-AUTOCONF_VERSION=`$AUTOCONF --version | head -1`
|
||
|
|
+AUTOCONF_VERSION=`$AUTOCONF --version | head -n 1`
|
||
|
|
case $AUTOCONF_VERSION in
|
||
|
|
Autoconf*2.5* | autoconf*2.5* ) : ;;
|
||
|
|
"" )
|
||
|
|
@@ -42,7 +42,7 @@
|
||
|
|
;;
|
||
|
|
esac
|
||
|
|
|
||
|
|
-AUTOHEADER_VERSION=`$AUTOHEADER --version | head -1`
|
||
|
|
+AUTOHEADER_VERSION=`$AUTOHEADER --version | head -n 1`
|
||
|
|
case $AUTOHEADER_VERSION in
|
||
|
|
Autoconf*2.5* | autoheader*2.5* ) : ;;
|
||
|
|
"" )
|
||
|
|
@@ -57,7 +57,7 @@
|
||
|
|
;;
|
||
|
|
esac
|
||
|
|
|
||
|
|
-AUTOMAKE_STRING=`$AUTOMAKE --version | head -1`
|
||
|
|
+AUTOMAKE_STRING=`$AUTOMAKE --version | head -n 1`
|
||
|
|
case $AUTOMAKE_STRING in
|
||
|
|
automake*1.5d* )
|
||
|
|
echo "*** YOU'RE USING $AUTOMAKE_STRING."
|
||
|
|
@@ -247,10 +247,10 @@
|
||
|
|
echo "AC_OUTPUT" >> configure.in.new
|
||
|
|
modulename=
|
||
|
|
if test -f configure.in.in; then
|
||
|
|
- if head -2 configure.in.in | egrep "^#MIN_CONFIG\(.*\)$" > /dev/null; then
|
||
|
|
+ if head -n 2 configure.in.in | egrep "^#MIN_CONFIG\(.*\)$" > /dev/null; then
|
||
|
|
kde_use_qt_param=`cat configure.in.in | sed -n -e "s/#MIN_CONFIG(\(.*\))/\1/p"`
|
||
|
|
fi
|
||
|
|
- if head -2 configure.in.in | egrep "^#MIN_CONFIG" > /dev/null; then
|
||
|
|
+ if head -n 2 configure.in.in | egrep "^#MIN_CONFIG" > /dev/null; then
|
||
|
|
line=`grep "^AM_INIT_AUTOMAKE(" configure.in.in`
|
||
|
|
if test -n "$line"; then
|
||
|
|
modulename=`echo $line | sed -e "s#AM_INIT_AUTOMAKE(\([^,]*\),.*#\1#"`
|
||
|
|
@@ -290,7 +290,7 @@
|
||
|
|
done
|
||
|
|
rm -f configure.files
|
||
|
|
touch configure.files
|
||
|
|
-if test -f configure.in.in && head -2 configure.in.in | grep "^#MIN_CONFIG" > /dev/null; then
|
||
|
|
+if test -f configure.in.in && head -n 2 configure.in.in | grep "^#MIN_CONFIG" > /dev/null; then
|
||
|
|
echo $admindir/configure.in.min >> configure.files
|
||
|
|
fi
|
||
|
|
test -f configure.in.in && echo configure.in.in >> configure.files
|
||
|
|
@@ -305,8 +305,8 @@
|
||
|
|
subdirs()
|
||
|
|
{
|
||
|
|
dirs=
|
||
|
|
-compilefirst=`sed -ne 's#^COMPILE_FIRST[ ]*=[ ]*##p' $makefile_am | head -1`
|
||
|
|
-compilelast=`sed -ne 's#^COMPILE_LAST[ ]*=[ ]*##p' $makefile_am | head -1`
|
||
|
|
+compilefirst=`sed -ne 's#^COMPILE_FIRST[ ]*=[ ]*##p' $makefile_am | head -n 1`
|
||
|
|
+compilelast=`sed -ne 's#^COMPILE_LAST[ ]*=[ ]*##p' $makefile_am | head -n 1`
|
||
|
|
for i in `ls -1`; do
|
||
|
|
if test -f $i/Makefile.am; then
|
||
|
|
case " $compilefirst $compilelast " in
|
||
|
|
@@ -323,11 +323,11 @@
|
||
|
|
done
|
||
|
|
|
||
|
|
(for d in $dirs; do
|
||
|
|
- list=`sed -ne "s#^COMPILE_BEFORE_$d""[ ]*=[ ]*##p" $makefile_am | head -1`
|
||
|
|
+ list=`sed -ne "s#^COMPILE_BEFORE_$d""[ ]*=[ ]*##p" $makefile_am | head -n 1`
|
||
|
|
for s in $list; do
|
||
|
|
echo $s $d
|
||
|
|
done
|
||
|
|
- list=`sed -ne "s#^COMPILE_AFTER_$d""[ ]*=[ ]*##p" $makefile_am | head -1`
|
||
|
|
+ list=`sed -ne "s#^COMPILE_AFTER_$d""[ ]*=[ ]*##p" $makefile_am | head -n 1`
|
||
|
|
for s in $list; do
|
||
|
|
echo $d $s
|
||
|
|
done
|
||
|
|
diff -urN QtCurve-0.21.orig/admin/libtool.m4.in QtCurve-0.21/admin/libtool.m4.in
|
||
|
|
--- QtCurve-0.21.orig/admin/libtool.m4.in 2003-02-20 07:36:14.000000000 -0500
|
||
|
|
+++ QtCurve-0.21/admin/libtool.m4.in 2004-05-16 21:10:26.000000000 -0400
|
||
|
|
@@ -4503,7 +4503,7 @@
|
||
|
|
# If the export-symbols file already is a .def file (1st line
|
||
|
|
# is EXPORTS), use it as is.
|
||
|
|
# If DATA tags from a recent dlltool are present, honour them!
|
||
|
|
- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='if test "x`head -1 $export_symbols`" = xEXPORTS; then
|
||
|
|
+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='if test "x`head -n 1 $export_symbols`" = xEXPORTS; then
|
||
|
|
cp $export_symbols $output_objdir/$soname-def;
|
||
|
|
else
|
||
|
|
echo EXPORTS > $output_objdir/$soname-def;
|
||
|
|
diff -urN QtCurve-0.21.orig/configure QtCurve-0.21/configure
|
||
|
|
--- QtCurve-0.21.orig/configure 2004-04-22 12:22:25.000000000 -0400
|
||
|
|
+++ QtCurve-0.21/configure 2004-05-16 21:11:51.000000000 -0400
|
||
|
|
@@ -7902,7 +7902,7 @@
|
||
|
|
# If the export-symbols file already is a .def file (1st line
|
||
|
|
# is EXPORTS), use it as is.
|
||
|
|
# If DATA tags from a recent dlltool are present, honour them!
|
||
|
|
- archive_expsym_cmds='if test "x`head -1 $export_symbols`" = xEXPORTS; then
|
||
|
|
+ archive_expsym_cmds='if test "x`head -n 1 $export_symbols`" = xEXPORTS; then
|
||
|
|
cp $export_symbols $output_objdir/$soname-def;
|
||
|
|
else
|
||
|
|
echo EXPORTS > $output_objdir/$soname-def;
|
||
|
|
@@ -13845,7 +13845,7 @@
|
||
|
|
# If the export-symbols file already is a .def file (1st line
|
||
|
|
# is EXPORTS), use it as is.
|
||
|
|
# If DATA tags from a recent dlltool are present, honour them!
|
||
|
|
- archive_expsym_cmds_GCJ='if test "x`head -1 $export_symbols`" = xEXPORTS; then
|
||
|
|
+ archive_expsym_cmds_GCJ='if test "x`head -n 1 $export_symbols`" = xEXPORTS; then
|
||
|
|
cp $export_symbols $output_objdir/$soname-def;
|
||
|
|
else
|
||
|
|
echo EXPORTS > $output_objdir/$soname-def;
|