Add AbiWord2 after repo copy from AbiWord. AbiWord2 is the GNOME Office

word processor build on Gtk 2.

7 files changed, 109 insertions, 105 deletions

diff --git a/editors/abiword-devel/files/patch-..::wv::libole2::Makefile.in b/editors/abiword-devel/files/patch-..::wv::libole2::Makefile.in
deleted file mode 100644
index c1aa9c4a9a1d..000000000000
--- a/editors/abiword-devel/files/patch-..::wv::libole2::Makefile.in
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- ../wv/libole2/Makefile.in	2001/11/23 14:38:19	1.1
-+++ ../wv/libole2/Makefile.in	2001/11/23 14:43:32
-@@ -13,7 +13,7 @@
- HAVE_GLIB = @HAVE_GLIB@
- HAVE_GNOMEVFS= @HAVE_GNOMEVFS@
- 
--CFLAGS = @CPPFLAGS@ @CFLAGS@ @DEFS@ -I$(srcdir)/ -I$(srcdir)/.. -DTTFDIR=\"$(datadir)/wv/ttf\" -I$(srcdir)/../libole2 @WMF_CFLAGS@ @GLIB_CFLAGS@
-+CFLAGS = -I$(srcdir)/.. @CPPFLAGS@ @CFLAGS@ @DEFS@ -I$(srcdir)/ -DTTFDIR=\"$(datadir)/wv/ttf\" -I$(srcdir)/../libole2 @WMF_CFLAGS@ @GLIB_CFLAGS@
- ifneq ($(HAVE_GLIB), 1)
- CFLAGS += -I$(srcdir)/../glib-wv/
- endif
diff --git a/editors/abiword-devel/files/patch-au b/editors/abiword-devel/files/patch-au
deleted file mode 100644
index 3c726a835376..000000000000
--- a/editors/abiword-devel/files/patch-au
+++ /dev/null
@@ -1,45 +0,0 @@
---- src/pkg/common/unix/scripts/makewrapper.sh.orig	Wed Jan 23 09:16:52 2002
-+++ src/pkg/common/unix/scripts/makewrapper.sh	Sat Feb 23 15:30:19 2002
-@@ -80,23 +80,31 @@
- if [ -z "\$locale" ]
- then
-     locale=\$LANG
-+elif [ -x \$locale ]
-+then
-+	locale=\$LC_CTYPE
- fi
- 
- if [ ! -z "\$locale" ]
- then
--    #now guess encoding
-+	#now guess country/region/encoding
-+	country=\`echo \$locale | sed -e 's/\(.*\)_.*\$/\1/'\`
-+	region=\`echo \$locale | sed -e 's/^.*_\(.*\)\..*/\1/'\`
-     encoding=\`echo \$locale | sed -e 's/^.*\.\(.*\)\$/\1/'\`
--    if [ ! -z "\$encoding" ]
-+	if [ ! -z \$country -o ! -z \$region -o ! -z \$encoding ]
-     then
--	addfontdir=\$ABISUITE_FONT_HOME/\$encoding
--	if [ ! -z "\$addfontdir" ]
--	then
--	    if [ -d "\$addfontdir" ]
--	    then
--	    	#add directory with locale-specific fonts to font path
--	    	ABISUITE_FONT_PATH=\$ABISUITE_FONT_PATH,\$addfontdir
--	    fi
--	fi
-+	addfontdirlst="\$ABISUITE_FONT_HOME/\$country \$ABISUITE_FONT_HOME/\${country}-\${region} \$ABISUITE_FONT_HOME/\$encoding \$ABISUITE_FONT_HOME/\${country}-\${region}.\${encoding}"
-+	for addfontdir in \$addfontdirlst
-+	do
-+		if [ ! -z \$addfontdir ]
-+		then
-+		if [ -d \$addfontdir -a ! -f \$addfontdir/.already-in-fp ]
-+		then
-+			#add directory with locale-specific fonts to font path
-+			ABISUITE_FONT_PATH=\$ABISUITE_FONT_PATH,\$addfontdir
-+		fi
-+		fi
-+	done
-     fi
- fi
- 
diff --git a/editors/abiword-devel/files/patch-autogen.sh b/editors/abiword-devel/files/patch-autogen.sh
index 57a58a879794..84fe028e64ac 100644
--- a/editors/abiword-devel/files/patch-autogen.sh
+++ b/editors/abiword-devel/files/patch-autogen.sh
@@ -1,54 +1,71 @@
-
-$FreeBSD$
-
---- autogen.sh.orig	Mon Mar 25 07:41:49 2002
-+++ autogen.sh	Tue Apr  9 12:35:41 2002
+--- autogen.sh.orig	Thu Oct 17 08:19:31 2002
++++ autogen.sh	Fri Feb 21 23:47:48 2003
 @@ -10,20 +10,20 @@
  
- set -e
+ rm -f autogen.err
  
 -automake --version | perl -ne 'if (/\(GNU automake\) ([0-9].[0-9])/) {print;  if ($1 < 1.4) {exit 1;}}'
-+automake14 --version | perl -ne 'if (/\(GNU automake\) ([0-9].[0-9])/) {print;  if ($1 < 1.4) {exit 1;}}'
++%%AUTOMAKE%% --version | perl -ne 'if (/\(GNU automake\) ([0-9].[0-9])/) {print; if ($1 < 1.4) {exit 1;}}'
  
  if [ $? -ne 0 ]; then
      echo "Error: you need automake 1.4 or later.  Please upgrade."
      exit 1
  fi
  
--if test ! -d `aclocal --print-ac-dir`; then
-+if test ! -d `aclocal14 --print-ac-dir`; then
-   echo "Bad aclocal (automake) installation"
+-if test ! -d `aclocal --print-ac-dir 2>> autogen.err`; then
+-  echo "Bad aclocal (automake) installation"
++if test ! -d `%%ACLOCAL%% --print-ac-dir 2>> autogen.err`; then
++  echo "Bad %%ACLOCAL%% (automake) installation"
    exit 1
  fi
  
  for script in `cd ac-helpers/fallback; echo *.m4`; do
--  if test -r `aclocal --print-ac-dir`/$script; then
-+  if test -r `aclocal14 --print-ac-dir`/$script; then
+-  if test -r `aclocal --print-ac-dir 2>> autogen.err`/$script; then
++  if test -r `%%ACLOCAL%% --print-ac-dir 2>> autogen.err`/$script; then
      # Perhaps it was installed recently
      rm -f ac-helpers/$script
    else
-@@ -34,13 +34,13 @@
+@@ -34,17 +34,17 @@
  
  # Produce aclocal.m4, so autoconf gets the automake macros it needs
- echo "Creating aclocal.m4..."
--aclocal -I ac-helpers
-+aclocal14 -I ac-helpers
+ # 
+-echo "Creating aclocal.m4: aclocal -I ac-helpers $ACLOCAL_FLAGS"
++echo "Creating aclocal.m4: %%ACLOCAL%% -I ac-helpers $ACLOCAL_FLAGS"
  
- # autoheader
+-aclocal -I ac-helpers $ACLOCAL_FLAGS 2>> autogen.err
++%%ACLOCAL%% -I ac-helpers $ACLOCAL_FLAGS 2>> autogen.err
  
+ echo "Checking for PKG_CHECK_MODULES..."
+ 
+ pkgcheckdef=`grep PKG_CHECK_MODULES aclocal.m4 | grep AC_DEFUN`
+ if test "x$pkgcheckdef" = "x"; then
+-  echo "Running aclocal -I ac-helpers -I ac-helpers/pkg-config $ACLOCAL_FLAGS"
+-  (aclocal -I ac-helpers -I ac-helpers/pkg-config $ACLOCAL_FLAGS 2>> autogen.err) || {
+-    echo "aclocal failed! Unable to continue."
++  echo "Running %%ACLOCAL%% -I ac-helpers -I ac-helpers/pkg-config $ACLOCAL_FLAGS"
++  (%%ACLOCAL%% -I ac-helpers -I ac-helpers/pkg-config $ACLOCAL_FLAGS 2>> autogen.err) || {
++    echo "%%ACLOCAL%% failed! Unable to continue."
+     exit 1
+   }
+   pkgcheckdef=`grep PKG_CHECK_MODULES aclocal.m4 | grep AC_DEFUN`
+@@ -66,9 +66,9 @@
  # Produce all the `GNUmakefile.in's and create neat missing things
  # like `install-sh', etc.
--automake --add-missing --copy --foreign
-+automake14 --add-missing --copy --foreign
- 
- # If there's a config.cache file, we may need to delete it.  
- # If we have an existing configure script, save a copy for comparison.
-@@ -50,7 +50,7 @@
+ # 
+-echo "automake --add-missing --copy --foreign"
++echo "%%AUTOMAKE%% --add-missing --copy --foreign"
  
- # Produce ./configure
+-automake --add-missing --copy --foreign 2>> autogen.err || {
++%%AUTOMAKE%% --add-missing --copy --foreign 2>> autogen.err || {
+     echo ""
+     echo "* * * warning: possible errors while running automake - check autogen.err"
+     echo ""
+@@ -84,7 +84,7 @@
+ # 
  echo "Creating configure..."
--autoconf
-+autoconf213
  
- echo ""
- echo "You can run ./configure now."
+-autoconf 2>> autogen.err || {
++%%AUTOCONF%% 2>> autogen.err || {
+     echo ""
+     echo "* * * warning: possible errors while running automake - check autogen.err"
+     echo ""
diff --git a/editors/abiword-devel/files/patch-configure.in b/editors/abiword-devel/files/patch-configure.in
deleted file mode 100644
index ff73266eed52..000000000000
--- a/editors/abiword-devel/files/patch-configure.in
+++ /dev/null
@@ -1,18 +0,0 @@
-
-$FreeBSD$
-
---- configure.in.orig	Thu Nov 22 01:08:37 2001
-+++ configure.in	Fri Nov 23 17:17:37 2001
-@@ -317,10 +317,10 @@
- 
- if test "$PLATFORM" = "unix"; then
- 	if test "$gnome" = "true"; then
--		PLATFORM_CFLAGS="$GNOME_CFLAGS $GMODULE_CFLAGS $GTK_CFLAGS -DSUPPORTS_UT_IDLE=1"
-+		PLATFORM_CFLAGS="$CFLAGS $GNOME_CFLAGS $GMODULE_CFLAGS $GTK_CFLAGS -DSUPPORTS_UT_IDLE=1"
- 		PLATFORM_LIBS=
- 	else
--		PLATFORM_CFLAGS="$GMODULE_CFLAGS $GTK_CFLAGS -DSUPPORTS_UT_IDLE=1"
-+		PLATFORM_CFLAGS="$CFLAGS $GMODULE_CFLAGS $GTK_CFLAGS -DSUPPORTS_UT_IDLE=1"
- 		PLATFORM_LIBS=
- 	fi
- fi
diff --git a/editors/abiword-devel/files/patch-src_af_xap_unix_xap_UnixFontManager.cpp b/editors/abiword-devel/files/patch-src_af_xap_unix_xap_UnixFontManager.cpp
new file mode 100644
index 000000000000..f30c23b080cc
--- /dev/null
+++ b/editors/abiword-devel/files/patch-src_af_xap_unix_xap_UnixFontManager.cpp
@@ -0,0 +1,39 @@
+--- src/af/xap/unix/xap_UnixFontManager.cpp.orig	Sat Feb 22 01:00:28 2003
++++ src/af/xap/unix/xap_UnixFontManager.cpp	Sat Feb 22 01:00:57 2003
+@@ -808,30 +808,30 @@
+ 		switch (f)
+ 		{
+ 		case GR_Font::FF_Roman:
+-			m_f[f].setFont(searchFont("Times-12"));
++			m_f[f].setFont(searchFont("Times 12"));
+ 			break;
+ 
+ 		case GR_Font::FF_Swiss:
+-			m_f[f].setFont(searchFont("Helvetica-12"));
++			m_f[f].setFont(searchFont("Helvetica 12"));
+ 			break;
+ 
+ 		case GR_Font::FF_Modern:
+-			m_f[f].setFont(searchFont("Courier-12"));
++			m_f[f].setFont(searchFont("Courier 12"));
+ 			break;
+ 
+ 		case GR_Font::FF_Script:
+-			m_f[f].setFont(searchFont("Cursive-12"));
++			m_f[f].setFont(searchFont("Cursive 12"));
+ 			break;
+ 
+ 		case GR_Font::FF_Decorative:
+-			m_f[f].setFont(searchFont("Old English-12"));
++			m_f[f].setFont(searchFont("Old English 12"));
+ 			break;
+ 
+ 		// ugh!?  BiDi is not a font family, what is it doing here?
+ 		// And what's that "Technical" thing?
+ 		case GR_Font::FF_Technical:
+ 		case GR_Font::FF_BiDi:
+-			m_f[f].setFont(searchFont("Arial-12"));
++			m_f[f].setFont(searchFont("Arial 12"));
+ 			break;
+ 			
+ 		default:
diff --git a/editors/abiword-devel/files/patch-src_pkg_linux_rpm_data_abiword.desktop b/editors/abiword-devel/files/patch-src_pkg_linux_rpm_data_abiword.desktop
new file mode 100644
index 000000000000..b875f7db74c2
--- /dev/null
+++ b/editors/abiword-devel/files/patch-src_pkg_linux_rpm_data_abiword.desktop
@@ -0,0 +1,14 @@
+--- src/pkg/linux/rpm/data/abiword.desktop.orig	Sun Dec  8 19:56:43 2002
++++ src/pkg/linux/rpm/data/abiword.desktop	Sat Feb 22 00:25:22 2003
+@@ -8,9 +8,9 @@
+ Comment[fr]=Traitement de texte AbiWord
+ Comment[pt]=Processador de Texto Abiword
+ Comment[sv]=Ordbehandlaren Abiword
+-Exec=abiword-2.0
++Exec=AbiWord-2.0
+ Icon=abiword_48.png
+ Terminal=0
+ Type=Application
+-Categories=Application;Office;WordProcessor;X-Red-Hat-Base;
++Categories=Application;Office;WordProcessor;
+ StartupNotify=true
diff --git a/editors/abiword-devel/files/patch-src_wp_ap_unix_ap_UnixApp.cpp b/editors/abiword-devel/files/patch-src_wp_ap_unix_ap_UnixApp.cpp
new file mode 100644
index 000000000000..69aae909af8c
--- /dev/null
+++ b/editors/abiword-devel/files/patch-src_wp_ap_unix_ap_UnixApp.cpp
@@ -0,0 +1,11 @@
+--- src/wp/ap/unix/ap_UnixApp.cpp.orig	Sat Feb 22 01:21:20 2003
++++ src/wp/ap/unix/ap_UnixApp.cpp	Sat Feb 22 01:21:31 2003
+@@ -1241,7 +1241,7 @@
+     pMyUnixApp->shutdown();
+     delete pMyUnixApp;
+     
+-    poptFreeContext (Args.poptcon);
++    //poptFreeContext (Args.poptcon);
+     return 0;
+ }
+