mirror of the now-defunct rocklinux.org
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.

153 lines
6.9 KiB

  1. # --- ROCK-COPYRIGHT-NOTE-BEGIN ---
  2. #
  3. # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
  4. # Please add additional copyright information _after_ the line containing
  5. # the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by
  6. # the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
  7. #
  8. # ROCK Linux: rock-src/package/sirkull/qtcurve/head.patch
  9. # ROCK Linux is Copyright (C) 1998 - 2005 Clifford Wolf
  10. #
  11. # This patch file is dual-licensed. It is available under the license the
  12. # patched project is licensed under, as long as it is an OpenSource license
  13. # as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
  14. # of the GNU General Public License as published by the Free Software
  15. # Foundation; either version 2 of the License, or (at your option) any later
  16. # version.
  17. #
  18. # --- ROCK-COPYRIGHT-NOTE-END ---
  19. diff -urN QtCurve-0.21.orig/acinclude.m4 QtCurve-0.21/acinclude.m4
  20. --- QtCurve-0.21.orig/acinclude.m4 2004-02-16 17:14:15.000000000 -0500
  21. +++ QtCurve-0.21/acinclude.m4 2004-05-16 21:12:21.000000000 -0400
  22. @@ -9876,7 +9876,7 @@
  23. # If the export-symbols file already is a .def file (1st line
  24. # is EXPORTS), use it as is.
  25. # If DATA tags from a recent dlltool are present, honour them!
  26. - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='if test "x`head -1 $export_symbols`" = xEXPORTS; then
  27. + _LT_AC_TAGVAR(archive_expsym_cmds, $1)='if test "x`head -n 1 $export_symbols`" = xEXPORTS; then
  28. cp $export_symbols $output_objdir/$soname-def;
  29. else
  30. echo EXPORTS > $output_objdir/$soname-def;
  31. diff -urN QtCurve-0.21.orig/aclocal.m4 QtCurve-0.21/aclocal.m4
  32. --- QtCurve-0.21.orig/aclocal.m4 2004-04-22 12:22:05.000000000 -0400
  33. +++ QtCurve-0.21/aclocal.m4 2004-05-16 21:10:54.000000000 -0400
  34. @@ -9854,7 +9854,7 @@
  35. # If the export-symbols file already is a .def file (1st line
  36. # is EXPORTS), use it as is.
  37. # If DATA tags from a recent dlltool are present, honour them!
  38. - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='if test "x`head -1 $export_symbols`" = xEXPORTS; then
  39. + _LT_AC_TAGVAR(archive_expsym_cmds, $1)='if test "x`head -n 1 $export_symbols`" = xEXPORTS; then
  40. cp $export_symbols $output_objdir/$soname-def;
  41. else
  42. echo EXPORTS > $output_objdir/$soname-def;
  43. diff -urN QtCurve-0.21.orig/admin/cvs.sh QtCurve-0.21/admin/cvs.sh
  44. --- QtCurve-0.21.orig/admin/cvs.sh 2003-02-20 07:36:14.000000000 -0500
  45. +++ QtCurve-0.21/admin/cvs.sh 2004-05-16 21:09:40.000000000 -0400
  46. @@ -27,7 +27,7 @@
  47. check_autotool_versions()
  48. {
  49. -AUTOCONF_VERSION=`$AUTOCONF --version | head -1`
  50. +AUTOCONF_VERSION=`$AUTOCONF --version | head -n 1`
  51. case $AUTOCONF_VERSION in
  52. Autoconf*2.5* | autoconf*2.5* ) : ;;
  53. "" )
  54. @@ -42,7 +42,7 @@
  55. ;;
  56. esac
  57. -AUTOHEADER_VERSION=`$AUTOHEADER --version | head -1`
  58. +AUTOHEADER_VERSION=`$AUTOHEADER --version | head -n 1`
  59. case $AUTOHEADER_VERSION in
  60. Autoconf*2.5* | autoheader*2.5* ) : ;;
  61. "" )
  62. @@ -57,7 +57,7 @@
  63. ;;
  64. esac
  65. -AUTOMAKE_STRING=`$AUTOMAKE --version | head -1`
  66. +AUTOMAKE_STRING=`$AUTOMAKE --version | head -n 1`
  67. case $AUTOMAKE_STRING in
  68. automake*1.5d* )
  69. echo "*** YOU'RE USING $AUTOMAKE_STRING."
  70. @@ -247,10 +247,10 @@
  71. echo "AC_OUTPUT" >> configure.in.new
  72. modulename=
  73. if test -f configure.in.in; then
  74. - if head -2 configure.in.in | egrep "^#MIN_CONFIG\(.*\)$" > /dev/null; then
  75. + if head -n 2 configure.in.in | egrep "^#MIN_CONFIG\(.*\)$" > /dev/null; then
  76. kde_use_qt_param=`cat configure.in.in | sed -n -e "s/#MIN_CONFIG(\(.*\))/\1/p"`
  77. fi
  78. - if head -2 configure.in.in | egrep "^#MIN_CONFIG" > /dev/null; then
  79. + if head -n 2 configure.in.in | egrep "^#MIN_CONFIG" > /dev/null; then
  80. line=`grep "^AM_INIT_AUTOMAKE(" configure.in.in`
  81. if test -n "$line"; then
  82. modulename=`echo $line | sed -e "s#AM_INIT_AUTOMAKE(\([^,]*\),.*#\1#"`
  83. @@ -290,7 +290,7 @@
  84. done
  85. rm -f configure.files
  86. touch configure.files
  87. -if test -f configure.in.in && head -2 configure.in.in | grep "^#MIN_CONFIG" > /dev/null; then
  88. +if test -f configure.in.in && head -n 2 configure.in.in | grep "^#MIN_CONFIG" > /dev/null; then
  89. echo $admindir/configure.in.min >> configure.files
  90. fi
  91. test -f configure.in.in && echo configure.in.in >> configure.files
  92. @@ -305,8 +305,8 @@
  93. subdirs()
  94. {
  95. dirs=
  96. -compilefirst=`sed -ne 's#^COMPILE_FIRST[ ]*=[ ]*##p' $makefile_am | head -1`
  97. -compilelast=`sed -ne 's#^COMPILE_LAST[ ]*=[ ]*##p' $makefile_am | head -1`
  98. +compilefirst=`sed -ne 's#^COMPILE_FIRST[ ]*=[ ]*##p' $makefile_am | head -n 1`
  99. +compilelast=`sed -ne 's#^COMPILE_LAST[ ]*=[ ]*##p' $makefile_am | head -n 1`
  100. for i in `ls -1`; do
  101. if test -f $i/Makefile.am; then
  102. case " $compilefirst $compilelast " in
  103. @@ -323,11 +323,11 @@
  104. done
  105. (for d in $dirs; do
  106. - list=`sed -ne "s#^COMPILE_BEFORE_$d""[ ]*=[ ]*##p" $makefile_am | head -1`
  107. + list=`sed -ne "s#^COMPILE_BEFORE_$d""[ ]*=[ ]*##p" $makefile_am | head -n 1`
  108. for s in $list; do
  109. echo $s $d
  110. done
  111. - list=`sed -ne "s#^COMPILE_AFTER_$d""[ ]*=[ ]*##p" $makefile_am | head -1`
  112. + list=`sed -ne "s#^COMPILE_AFTER_$d""[ ]*=[ ]*##p" $makefile_am | head -n 1`
  113. for s in $list; do
  114. echo $d $s
  115. done
  116. diff -urN QtCurve-0.21.orig/admin/libtool.m4.in QtCurve-0.21/admin/libtool.m4.in
  117. --- QtCurve-0.21.orig/admin/libtool.m4.in 2003-02-20 07:36:14.000000000 -0500
  118. +++ QtCurve-0.21/admin/libtool.m4.in 2004-05-16 21:10:26.000000000 -0400
  119. @@ -4503,7 +4503,7 @@
  120. # If the export-symbols file already is a .def file (1st line
  121. # is EXPORTS), use it as is.
  122. # If DATA tags from a recent dlltool are present, honour them!
  123. - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='if test "x`head -1 $export_symbols`" = xEXPORTS; then
  124. + _LT_AC_TAGVAR(archive_expsym_cmds, $1)='if test "x`head -n 1 $export_symbols`" = xEXPORTS; then
  125. cp $export_symbols $output_objdir/$soname-def;
  126. else
  127. echo EXPORTS > $output_objdir/$soname-def;
  128. diff -urN QtCurve-0.21.orig/configure QtCurve-0.21/configure
  129. --- QtCurve-0.21.orig/configure 2004-04-22 12:22:25.000000000 -0400
  130. +++ QtCurve-0.21/configure 2004-05-16 21:11:51.000000000 -0400
  131. @@ -7902,7 +7902,7 @@
  132. # If the export-symbols file already is a .def file (1st line
  133. # is EXPORTS), use it as is.
  134. # If DATA tags from a recent dlltool are present, honour them!
  135. - archive_expsym_cmds='if test "x`head -1 $export_symbols`" = xEXPORTS; then
  136. + archive_expsym_cmds='if test "x`head -n 1 $export_symbols`" = xEXPORTS; then
  137. cp $export_symbols $output_objdir/$soname-def;
  138. else
  139. echo EXPORTS > $output_objdir/$soname-def;
  140. @@ -13845,7 +13845,7 @@
  141. # If the export-symbols file already is a .def file (1st line
  142. # is EXPORTS), use it as is.
  143. # If DATA tags from a recent dlltool are present, honour them!
  144. - archive_expsym_cmds_GCJ='if test "x`head -1 $export_symbols`" = xEXPORTS; then
  145. + archive_expsym_cmds_GCJ='if test "x`head -n 1 $export_symbols`" = xEXPORTS; then
  146. cp $export_symbols $output_objdir/$soname-def;
  147. else
  148. echo EXPORTS > $output_objdir/$soname-def;