diff --git a/.cvsignore b/.cvsignore index d23080e..e7374a4 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1,4 @@ -abiword-2.4.6.tar.bz2 +abiword-2.6.0.tar.gz +abiword-plugins-2.6.0.tar.gz +abiword-extras-2.6.0.tar.gz +abiword-docs-2.6.0.tar.gz diff --git a/abiword-2.0.9-windowshelppaths.patch b/abiword-2.0.9-windowshelppaths.patch deleted file mode 100644 index 187b02d..0000000 --- a/abiword-2.0.9-windowshelppaths.patch +++ /dev/null @@ -1,254 +0,0 @@ -diff -r -u abiword-2.0.9.orig/abiword-docs/ABW/fr-FR/howto/howtoword.abw abiword-2.0.9/abiword-docs/ABW/fr-FR/howto/howtoword.abw ---- abiword-2.0.9.orig/abiword-docs/ABW/fr-FR/howto/howtoword.abw 2004-07-28 19:00:11.612412860 +0100 -+++ abiword-2.0.9/abiword-docs/ABW/fr-FR/howto/howtoword.abw 2004-07-28 19:00:49.785296529 +0100 -@@ -23,7 +23,7 @@ -

Il est presque inévitable qu'à un certain moment, vous aurez le besoin d'expédier un document que vous avez créé avec AbiWord à une personne utilisant Microsoft Word ou ouvrir un document créé avec Microsoft Word avec AbiWord. Heureusement, il est facile de réaliser ces transferts.

-

Visualiser un document AbiWord avec Microsoft Word

-

Jusqu'à ce que Microsoft annonce le support des fichiers d'AbiWord, les documents créés avec AbiWord nécessiteront d'être exportés dans un format que Word peut lire. L'enregistrement au format Rich Text Format permet de réaliser facilement cette exportation.

--

-+

-

-

Le format Rich Text est couramment utilisé par les produits Microsoft Office et ils n'auront aucune difficulté à importer les documents enregistrés ainsi.

-

Visualiser les documents Word avec AbiWord

-@@ -31,7 +31,7 @@ -

Si vous rencontrez des problèmes, demandez à l'utilisateur de Word d'enregistrer le document au format Rich Text Format (.rtf). Toutes les versions de Microsoft Word peuvent le faire et AbiWord peut ouvrir les fichiers RTF de manière fiable.

- - -- -+ - iVBORw0KGgoAAAANSUhEUgAAAhwAAAKXCAYAAADJiZNnAAAABmJLR0QA/wD/AP+gvaeTAAAA - CXBIWXMAAAsSAAALEgHS3X78AAAAB3RJTUUH0gUSDDMylHTKNAAAIABJREFUeJzsvV+oJcl5 - 4PlVcwzngh6qG2TUxgtbl9lmu+7QuOvONu6usbBKEuw0eGGEdmE07MO4C4tZ2TMsMy9m9bY9 -diff -r -u abiword-2.0.9.orig/abiword-docs/ABW/fr-FR/interface/dialogreplace.abw abiword-2.0.9/abiword-docs/ABW/fr-FR/interface/dialogreplace.abw ---- abiword-2.0.9.orig/abiword-docs/ABW/fr-FR/interface/dialogreplace.abw 2004-07-28 19:00:11.595415583 +0100 -+++ abiword-2.0.9/abiword-docs/ABW/fr-FR/interface/dialogreplace.abw 2004-07-28 19:00:49.786296369 +0100 -@@ -16,7 +16,7 @@ - -
-

Dialogue remplacer

--

-+

-

Rechercher

-

Entrez le mot que vous désirez rechercher dans cette boîte. Il s'agit de la chaîne de recherche. Cette commande recherche la chaîne de caractères ou de nombres que vous entrez. Ainsi, si vous recherchez en, vous trouverez les deux lettres au milieu du mot dent tout autant que le mot en.

-

Respecter la casse

-@@ -33,7 +33,7 @@ -

Ce bouton ferme le dialogue Remplacer.

-
- -- -+ - iVBORw0KGgoAAAANSUhEUgAAAdkAAACqCAIAAABu5KKOAAAaMElEQVR4nO2dX4gkx33Hfxfa - UAMXmDEyaPWknYcj2jFHtBMd6BaF6BzlQdgPtslDTn7KiRjspxDpIfjyEklvtgPByoOQYgg+ - P8TS6cGnS/BFa5DZPdAxu7Dy3JhE3CxEeJbo2G7wQf/ABZuHqq6urv4zPT3d23u33w/LUl1d -diff -r -u abiword-2.0.9.orig/abiword-docs/ABW/fr-FR/interface/workspace.abw abiword-2.0.9/abiword-docs/ABW/fr-FR/interface/workspace.abw ---- abiword-2.0.9.orig/abiword-docs/ABW/fr-FR/interface/workspace.abw 2004-07-28 19:00:11.604414141 +0100 -+++ abiword-2.0.9/abiword-docs/ABW/fr-FR/interface/workspace.abw 2004-07-28 19:00:49.789295889 +0100 -@@ -23,24 +23,24 @@ -
-

L'espace de travail d'AbiWord

-

AbiWord a une apparence très similaire à d'autres traitements de texte, ce qui, nous l'espérons, met à l'aise toute personne qui débute avec le logiciel.

--

-+

-

L'interface familière devrait permettre à la plupart des personnes de démarrer le travail immédiatement. Cependant, certaines caractéristiques sont peut-être nouvelles.

-

Titre de fenêtre

--

-+

-

La fenêtre de titre est similaire à cette de toute autre application, avec une différence toutefois. Notez le caractère * près de Document10. L'astérique signifie que Document10 a été modifié. Ceci fourni un manière simple d'identifier si le document doit être enregistré.

-

Les barres de fonction

--

Voici les trois plus importantes barres de fonctions. La première, nommée barre de menu, est le meilleur endroit pour se familiariser avec AbiWord. Il est préférable d'y débuter l'exploration des menus pour saisir ce que AbiWord peut faire avec les documents.

-+

Voici les trois plus importantes barres de fonctions. La première, nommée barre de menu, est le meilleur endroit pour se familiariser avec AbiWord. Il est préférable d'y débuter l'exploration des menus pour saisir ce que AbiWord peut faire avec les documents.

-

La seconde est la barre d'outils standard et la troisième (au bas) est la barre d'outils de mise en forme.

-

Manipuler les barres

-

AbiWord permet de cacher les barres. Si certaines manquent ou ne sont pas requises vérifiez le menu Affichage > Barres d'outils.

--

-+

-

Barre de saisie

-

-

Pour ceux qui exécutent AbiWord sous GNOME, La barre de saisie localisée à l'extrémité gauche de chaque barre d'outils représente une manières simple offerte à chacun de modifier l'interface à leur convenance. Cliquez la barre de saisie et déplacez-là. La barre d'outils suivra la souris, permettant même à la barre d'outil de survoler une partie quelconque de l'écran.

-

Barre d'état

-

-

La barre d'état permet une vue rapide de l'état du document. A la gauche, AbiWord note la page courante. La boîte du milieu, qui est habituellement vide, affiche un message d'aide rapide décrivant l'option de menu courante.

--

-+

-

Les règles

-

-

En employant les règles, il devient facile de fixer les marges de la page et les tabulations.

-@@ -49,7 +49,7 @@ -

-
- -- -+ - iVBORw0KGgoAAAANSUhEUgAAAogAAAGNCAIAAAAdDhfDAAAgAElEQVR4nOy9bWwcx5ku+mjR - vqgJmMWMoSw4gh1oCFnIkLZhkhtBGkbBmjoOYDpZwKIdwGZ8FgnlBDYdX2Qt70EiO4u7trPY - WE5wEmuDxKKDbEQZiCXqIpaYQDozOpB2hoKU4QSSyTFsg0NsBDcRE5rGCeEuXDWg+6O6q6ur -@@ -732,7 +732,7 @@ - Wou0TTikLDRhjmgVAQUDQ4DAoNDRir5zy+NoJmoB6UympdYFSExwmp8h7V3X9DzWmFzStIMW - iGVuXG2lztIQVvgtffSrFKSfSwNqoDCo/g+anqxAe88lpQAAAABJRU5ErkJggg== - -- -+ - iVBORw0KGgoAAAANSUhEUgAAAikAAAEyCAIAAACwCNeMAAAACXBIWXMAAABEAAAARACdvuRJ - AABTv0lEQVR42u29f2wcx5nn/bXQflGzYF4MDSfgGEngIbJGKCbGSrw1LCoJTtRqcWHWC1hO - Foi8uRf2yA4SOTns2flj3yR3eC82Du+beA/5oQTrFWXsxT+AtS0DF1kXREdqYYekYYecQAo1 -@@ -1135,7 +1135,7 @@ - MThhNzQ3OWNiNDVjMWM4ZjU4ODEwMjAxODdiNmZkOGRmYmNlZGIwNjWQ4/dNAAAAAElFTkSu - QmCC - -- -+ - iVBORw0KGgoAAAANSUhEUgAAAnwAAABeCAIAAAA2dF4VAAAACXBIWXMAAABEAAAARACdvuRJ - AABD6UlEQVR42u29fYwc1Zkv/HNUXFVHzlWPBdG0BZG7BRY9DVZmOrGYmQVdZjbRzZi9EraJ - BEPeVRgDAjtIiU1WiSHRrk1WG5tEy8VEITNcZRk7UrDNVRhPInO7/cpst9FAz0SGno4ATVvB -@@ -1496,7 +1496,7 @@ - DARcAEBsLLAFAABFC65ZAT5ljHl7Cpt/HGtWAABrMLOCaDgEBABIgTUriEbi4lkAQPkIK4iC - QzsAgFT+AnafvftOpg+NAAAAAElFTkSuQmCC - -- -+ - iVBORw0KGgoAAAANSUhEUgAAAoYAAAAWCAIAAADSEcpEAAAACXBIWXMAAABEAAAARACdvuRJ - AAAKN0lEQVR42u2dXYjc1hXH/wEFjmACEriwAy10TAlxHEq9bgO2ScBx85AtLsROXtYkD0me - 4rSQ2n0o5CnYD/1wCiHbQogTKN0EanYWmnobanZcajxbutkZ8McqtCYa6IIGvFgXMqADvg99 -@@ -1550,7 +1550,7 @@ - N2NlNzE0YWQwMjdlM2M5MWZiMjk0ZTc2ZDNlNDU2ZmQxMjFjZmE4ODZiNWRlMGUzZTNmZjhm - ZTJhZTY0MmU4HyCiUgAAAABJRU5ErkJggg== - -- -+ - iVBORw0KGgoAAAANSUhEUgAAAm8AAACbCAIAAAC7yOv5AAAACXBIWXMAAABEAAAARACdvuRJ - AAAqpUlEQVR42u2df2hlx5XnT4cbqAcaeDJOkGB3icTSxFII69Zug92TMN2eXkgvXoiT/LEd - ZiBW40DayZCN88eS5J9J+4/9kVmSuGdYY7VhZ+3ABsuwiXuH9LZ6iSMpuEfS0G31M4nRE6yZ -diff -r -u abiword-2.0.9.orig/abiword-docs/ABW/pl-PL/howto/howtoword.abw abiword-2.0.9/abiword-docs/ABW/pl-PL/howto/howtoword.abw ---- abiword-2.0.9.orig/abiword-docs/ABW/pl-PL/howto/howtoword.abw 2004-07-28 19:00:11.584417345 +0100 -+++ abiword-2.0.9/abiword-docs/ABW/pl-PL/howto/howtoword.abw 2004-07-28 19:00:49.791295568 +0100 -@@ -24,7 +24,7 @@ -

Podgląd dokumentów AbiWorda w programie Microsoft Word

-

Jakkolwiek Microsoft zapowiada wsparcie dla plików AbiWorda, to przede wszystkim dokumenty tworzone w AbiWordzie powinny być eksportowane do formatu czytelnego dla programu Microsoft Word. Najłatwiej to zrobić przez zapisanie pliku w postaci Rich Text Format.

-

--

-+

-

-

Rich Text Format często jest używany przez pakiet oprogramowania biurowego firmy Microsoft i nie będzie problemów z importem dokumentów zapisanych w ten sposób.

-

Podgląd dokumentów Microsoft Word w AbiWordzie

-@@ -32,7 +32,7 @@ -

Jeśli napotykasz problemy, to poproś użytkownika programu Microsoft Word, aby zapisywał dokumenty jako Rich Text Format (.rtf). Wszystkie wersje programu Microsoft Word mogą zapisywać pliki w tym formacie, a AbiWord potrafi wiernie odczytywać pliki typu RTF.

- - -- -+ - iVBORw0KGgoAAAANSUhEUgAAAl0AAAGYCAIAAAGAKvBwAAAACXBIWXMAAAsSAAALEgHS3X78 - AAAACXRFWHRDb21tZW50AACJKo0GAAAgAElEQVR4nOxdCXQUxbru6Z59Jvu+IU9Qr7jh8Yrg - Coq4IKiIinAFFFxYghCQhASyEQj7GgKB7CsJgYCAEJLM9ARCUNGrjyvi9TxChCBclsBlMWzp -diff -r -u abiword-2.0.9.orig/abiword-docs/ABW/pl-PL/interface/workspace.abw abiword-2.0.9/abiword-docs/ABW/pl-PL/interface/workspace.abw ---- abiword-2.0.9.orig/abiword-docs/ABW/pl-PL/interface/workspace.abw 2004-07-28 19:00:11.576418627 +0100 -+++ abiword-2.0.9/abiword-docs/ABW/pl-PL/interface/workspace.abw 2004-07-28 19:00:49.962268173 +0100 -@@ -25,24 +25,24 @@ -

Obszar roboczy AbiWorda

-

Obszar roboczy jest podobny do tych, jakie znamy z innych edytorów tekstu. Dlatego każdy nowy użytkownik AbiWorda może się czuć jak u siebie w domu.

-

--

-+

-

-

Znajomy interfejs pozwala większości użytkownikom od razu rozpocząć pracę. Tym niemniej niektóre możliwości będą nowością.

-

-

Okno tytułu

-

--

-+

-

-

Okno tytułu jest podobne do okien innych aplikacji, z jedną jednak różnicą. Zwóć uwagę na gwiazdkę * obok “Dokument_10“. Gwiazdka oznacza, że “Dokument_10“ został zmodyfikowany. W ten prosty sposób AbiWord podpowiada ci, że dokument powinien być zapisany.

-

Paski funkcji

--

-+

-

-

Oto trzy podstawowe paski funkcji. Pierwszy, nazywany Paskiem Menu, to najlepsze miejsce, by zapoznać się z AbiWordem. Najlepiej po prostu przejrzyj każde menu, wtedy poznasz wszystkie komendy, jakich AbiWord może użyć do dokumentów.

-

Drugi to pasek “Standardowy”, trzeci z wyżej pokazanych (na dole) to pasek "Formatowanie".

-

Paski robocze

-

AbiWord pozwala na ukrywanie pasków narzędzi. Jeśli któregoś brakuje albo nie jest potrzebny, sprawdź w Widok > Paski narzędzi.

-

--

-+

-

Pasek uchwytu

-

-

-@@ -50,14 +50,14 @@ -

Użytkownicy, którzy uruchamiają AbiWorda w środowisku GNOME, znajdą pasek uchwytu umieszczony na skraju lewej części każdego z pasków narzędziowych, który pozwala w prosty sposób zmodyfikować interfejs wedle życzenia. Kliknij na pasek uchwytu i przeciągnij. Pasek narzędziowy będzie przesuwać się wzdłuż toru myszki, może nawet wisieć nad dowolną częścią ekranu.

-

Pasek statusu

-

--

-+

-

-

W pasku statusu znajdziesz skrótowy opis statusu dokumentu. W lewej części paska AbiWord wyświetla kolejny numer strony oraz liczbę wszystkich stron. Następnie w środkowej części, która najczęściej jest pusta, wyświetlany jest krótki pomocniczy opis bieżącej opcji menu. W prawej części paska podany jest tryb pracy klawiatury (+INS, czyli tryb wstawiania, albo -ins, czyli tryb zastępowania) oraz nazwa aktualnego szablonu.

-

--

-+

-

Linijka

-

--

-+

-

-

Używając linijki możesz w łatwy sposób definiować na stronie marginesy oraz tabulatory.

- -@@ -65,7 +65,7 @@ -

- - -- -+ - iVBORw0KGgoAAAANSUhEUgAAApwAAAFhCAIAAAElyt0+AAAACXBIWXMAAAsSAAALEgHS3X78 - AAAACXRFWHRDb21tZW50AACJKo0GAAAgAElEQVR4nOxdCXwURdbvLPC54IeIuMoKArKcUQgi - d2JABIGVKxwGVrmPGMQQzklmJpcCIUBMgpBwJBzBEI4glwR0RTySzISEzAyZJIC6IB6suwLK -@@ -1458,7 +1458,7 @@ - Wou0TTikLDRhjmgVAQUDQ4DAoNDRir5zy+NoJmoB6UympdYFSExwmp8h7V3X9DzWmFzStIMW - iGVuXG2lztIQVvgtffSrFKSfSwNqoDCo/g+anqxAe88lpQAAAABJRU5ErkJggg== - -- -+ - iVBORw0KGgoAAAANSUhEUgAAAp8AAAAYCAIAAAFEpzGAAAAACXBIWXMAAAsSAAALEgHS3X78 - AAAACXRFWHRDb21tZW50AACJKo0GAAAgAElEQVR4nOx9d1RUWbZ38TqYMAdUkAKabCBoS5As - qKAiKIIgWck5JwkigkgWEFSiiIqCtpjaHFqSIlSBobvtoHaY6fj19Dezpue9Wa++fc6+99at -@@ -1824,7 +1824,7 @@ - U3NkC/pNXf3TzsJ2jxwsz3aUR7tKcWkNGacs2/619xjliewpfDI4XsC01wCb6ZPN6En3gjNT - F/m4k8smfLv/D9XFSL9vOncQAAAAAElFTkSuQmCC - -- -+ - iVBORw0KGgoAAAANSUhEUgAAAp0AAADuCAIAAAGDmRu5AAAACXBIWXMAAAsSAAALEgHS3X78 - AAAACXRFWHRDb21tZW50AACJKo0GAAAgAElEQVR4nOxdCVQUx7oeAi5EcXlZTKKXQUUJmgii - kVUkUURwQdwAgwiIwKCAKLLIooiiILKIgiKCgrsoKhHUuAvMsM4gi8bk5ZpEk6OJeZrz7kty -@@ -2753,7 +2753,7 @@ - rHHd5lpt9kxeQWueBlaZZ/Fw+ux83+U9jEtmQ0dDO9V/An0RGn6kluj/H0TjWnMwPK11AAAA - AElFTkSuQmCC - -- -+ - iVBORw0KGgoAAAANSUhEUgAAApwAAAAXCAIAAAFexjhWAAAACXBIWXMAAAsSAAALEgHS3X78 - AAAACXRFWHRDb21tZW50AACJKo0GAAAQ2ElEQVR4nO1dC1fbuBIOr+7v3W0pPUtS2P61S3Cc - 0NiOQ7g/5HZpu6fkzswnjR628yKQkPU5g4+QZVmR5q0ZuTPJhkWRFvmoCXJq0Hz3hSAvgn/L -@@ -2837,7 +2837,7 @@ - pHc9YRw/VddzPPJlb69v8xK8bi3Qo7dknmEXttcXuibeNbhLgrjSHv6qx6vuxdUlifPRnA9/ - vvh8+bGUMol5AkbjCX+D/v/6OPv+i4Ym1QAAAABJRU5ErkJggg== - -- -+ - iVBORw0KGgoAAAANSUhEUgAAAp8AAABWCAIAAAFx9VqcAAAACXBIWXMAAAsSAAALEgHS3X78 - AAAACXRFWHRDb21tZW50AACJKo0GAAAgAElEQVR4nOx9CXxU1bn4HRJwa23rv699z7a2tX1t - ta226nOBWLVqfW3t5trF1rpVpVpbBFlmEpBFUURZFZCloICgoIKAooBCJpN1lsxkwhJIWAOU -@@ -3416,7 +3416,7 @@ - bOnGe+2M3XYot2UDS4L5O8omnlXu+gHXqLwXOB02sXB53k22Z9RfqVlmje7/A8GWRyS/OvHV - AAAAAElFTkSuQmCC - -- -+ - iVBORw0KGgoAAAANSUhEUgAAA1IAAAAhCAIAAAErHT00AAAACXBIWXMAAAsSAAALEgHS3X78 - AAAACXRFWHRDb21tZW50AACJKo0GAAAN60lEQVR4nO1djXLbOA6WNnmmvb1r76l2u0lrqd2H - c+OkzkRy7Tj3KJ26tg8kJIrWD0VLlAjZwHyjcWSGhiASBEkADN69/xejD4Jt8jWO7uL4A3xA -@@ -3486,7 +3486,7 @@ - 5Nm7YpO32pdkR7qtS7ijYei3Sa21MD/MD/PD/DA/18gPH/dai3qzrxHWK0Y91/kYVcAsR85m - FvqatoL+5yYxmH0MBoPBYFwa2MizxP8Bf0pzQLOvs0QAAAAASUVORK5CYII= - -- -+ - iVBORw0KGgoAAAANSUhEUgAAAVQAAACgCAIAAAGrgzPPAAAACXBIWXMAAAsSAAALEgHS3X78 - AAAACXRFWHRDb21tZW50AACJKo0GAAAgAElEQVR4nLRcC3CURbb+h8lr8k4IRALOPwmQ18S8 - ABHxcVnBSMTwlofZSEiCGALy2EgkExRlQQQf4FvR0t3VXXdXry513dq61i2rbkIICZkZEhK3 diff --git a/abiword-2.4.4-desktop.patch b/abiword-2.4.4-desktop.patch deleted file mode 100644 index 9f203dd..0000000 --- a/abiword-2.4.4-desktop.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -r -u abiword-2.4.4.orig/abi/abiword.desktop abiword-2.4.4/abi/abiword.desktop ---- abiword-2.4.4.orig/abi/abiword.desktop 2006-04-03 14:14:01.000000000 +0200 -+++ abiword-2.4.4/abi/abiword.desktop 2006-04-11 00:12:19.000000000 +0200 -@@ -7,7 +7,7 @@ - StartupNotify=true - Encoding=UTF-8 - X-Desktop-File-Install-Version=0.9 --MimeType=application/x-abiword;text/x-abiword;text/x-xml-abiword;text/plain;application/msword;application/rtf;application/vnd.plain;application/xhtml+xml;text/html; -+MimeType=application/msword;application/vnd.sun.xml.writer;application/vnd.wordperfect;application/x-abiword;text/x-abiword;text/x-xml-abiword;application/rtf;text/plain;application/xhtml+xml;text/html;text/vnd.wap.wml;application/vnd.plain;application/vnd.stardivision.writer;application/x-mif;application/x-kword;application/x-applix-word;application/x-mswrite;application/vnd.oasis.opendocument.text; - Name=AbiWord - GenericName=Word Processor - Comment=AbiWord Word Processor diff --git a/abiword-2.4.6-boolean.patch b/abiword-2.4.6-boolean.patch deleted file mode 100644 index 68f6e5e..0000000 --- a/abiword-2.4.6-boolean.patch +++ /dev/null @@ -1,36 +0,0 @@ ---- abi/src/text/ptbl/xp/pd_Style.h.orig 2005-05-20 15:37:09.000000000 -0400 -+++ abi/src/text/ptbl/xp/pd_Style.h 2008-01-28 23:18:05.000000000 -0500 -@@ -21,6 +21,9 @@ - #ifndef PD_STYLE_H - #define PD_STYLE_H - -+#ifndef FALSE -+#define FALSE 0 -+#endif /* FALSE */ - #include "ut_types.h" - #include "pt_Types.h" - #include "ut_xml.h" ---- abiword-plugins/tools/abigrammar/linkgrammarwrap/LinkGrammarWrap.h.orig 2005-02-10 18:41:13.000000000 -0500 -+++ abiword-plugins/tools/abigrammar/linkgrammarwrap/LinkGrammarWrap.h 2008-01-29 00:11:38.000000000 -0500 -@@ -20,6 +20,9 @@ - #ifndef __LinkGrammarWrap_h__ - #define __LinkGrammarWrap_h__ - -+#ifndef TRUE -+#define TRUE 1 -+#endif /* TRUE */ - extern "C" { - #include - } ---- abiword-plugins/wp/impexp/OpenDocument/imp/xp/ODi_Style_Style.h.orig 2006-03-13 16:53:04.000000000 -0500 -+++ abiword-plugins/wp/impexp/OpenDocument/imp/xp/ODi_Style_Style.h 2008-01-29 00:14:48.000000000 -0500 -@@ -23,6 +23,9 @@ - #ifndef _ODI_STYLE_STYLE_H_ - #define _ODI_STYLE_STYLE_H_ - -+#ifndef TRUE -+#define TRUE 1 -+#endif /* TRUE */ - // Internal includes - #include "ODi_ListenerState.h" - diff --git a/abiword-2.4.6-fontmanager.patch b/abiword-2.4.6-fontmanager.patch deleted file mode 100644 index 8fe81f4..0000000 --- a/abiword-2.4.6-fontmanager.patch +++ /dev/null @@ -1,124 +0,0 @@ -diff -r -u abiword-2.4.6.orig/abi/src/af/xap/unix/xap_UnixFontManager.cpp abiword-2.4.6/abi/src/af/xap/unix/xap_UnixFontManager.cpp ---- abiword-2.4.6.orig/abi/src/af/xap/unix/xap_UnixFontManager.cpp 2006-05-12 15:08:58.000000000 +0200 -+++ abiword-2.4.6/abi/src/af/xap/unix/xap_UnixFontManager.cpp 2007-04-06 17:36:20.000000000 +0200 -@@ -87,7 +87,7 @@ - return pVec; - } - --static XAP_UnixFont* buildFont(XAP_UnixFontManager* pFM, FcPattern* fp) -+static void buildFonts(XAP_UnixFontManager* pFM, FcPattern* fp, UT_GenericVector& vFonts) - { - unsigned char* fontFile = NULL; - bool bold = false; -@@ -102,7 +102,7 @@ - { - // ok, and now what? If we can not get the font file of the font, we can not print it! - UT_DEBUGMSG(("Unknown font file!!\n")); -- return false; -+ return; - } - - if (FcPatternGetInteger(fp, FC_WEIGHT, 0, &weight) != FcResultMatch) -@@ -117,7 +117,7 @@ - size_t ffs = metricFile.size(); - if ( !((ffs >= 4 && fontFile[ffs - 4] == '.') || - (ffs >= 5 && fontFile[ffs - 5] == '.') )) // Separate check to avoid [-1] -- return NULL; -+ return; - - // handle '.font' - if (fontFile[ffs - 5] == '.') -@@ -137,9 +137,6 @@ - char* xlfd = reinterpret_cast(FcNameUnparse(fp)); - // UT_String sXLFD = xlfd; - // UT_ASSERT(sXLFD.size() < 100); -- // get the family of the font -- unsigned char *family; -- FcPatternGetString(fp, FC_FAMILY, 0, &family); - - XAP_UnixFont::style s = XAP_UnixFont::STYLE_NORMAL; - -@@ -158,19 +155,31 @@ - break; - } - -- XAP_UnixFont* font = new XAP_UnixFont(pFM); -- /* we try to open the font. If we fail, we try to open it removing the bold/italic info, if we fail again, we don't try again */ -- if (!font->openFileAs(reinterpret_cast(fontFile), metricFile.utf8_str(), reinterpret_cast(family), xlfd, s) && -- !font->openFileAs(reinterpret_cast(fontFile), metricFile.utf8_str(), reinterpret_cast(family), xlfd, XAP_UnixFont::STYLE_NORMAL)) -- { -- UT_DEBUGMSG(("Impossible to open font file [%s] [%d]\n.", reinterpret_cast(fontFile), s)); -- font->setFontManager(NULL); // This font isn't in the FontManager cache (yet), so it doesn't need to unregister itself -- delete font; -- font = NULL; -- } -+ unsigned char *family; -+ int id; -+ -+ id = 0; -+ // get the families of the font -+ while (FcPatternGetString(fp, FC_FAMILY, id, &family) == FcResultMatch) -+ { -+ -+ XAP_UnixFont* font = new XAP_UnixFont(pFM); -+ /* we try to open the font. If we fail, we try to open it removing the bold/italic info, if we fail again, we don't try again */ -+ if (!font->openFileAs(reinterpret_cast(fontFile), metricFile.utf8_str(), reinterpret_cast(family), xlfd, s) && -+ !font->openFileAs(reinterpret_cast(fontFile), metricFile.utf8_str(), reinterpret_cast(family), xlfd, XAP_UnixFont::STYLE_NORMAL)) -+ { -+ UT_DEBUGMSG(("Impossible to open font file [%s] [%d]\n.", reinterpret_cast(fontFile), s)); -+ font->setFontManager(NULL); // This font isn't in the FontManager cache (yet), so it doesn't need to unregister itself -+ DELETEP(font); -+ } -+ else -+ { -+ vFonts.addItem(font); -+ } -+ id++; -+ } - - free(xlfd); -- return font; - } - - /* add to the cache all the scalable fonts that we find */ -@@ -180,29 +189,24 @@ - return true; - - FcFontSet* fs; -- XAP_UnixFont* pFont; -- - fs = FcConfigGetFonts(FcConfigGetCurrent(), FcSetSystem); -- -- if (fs) -- { -+ if (fs) -+ { - m_pFontSet = FcFontSetCreate(); -- - for (UT_sint32 j = 0; j < fs->nfont; j++) - { -- // we want to create two fonts: one layout, and one device. -- - /* if the font file ends on .ttf, .pfa or .pfb we add it */ -- pFont = buildFont(this, fs->fonts[j]); -- -- if (pFont) -- { -+ UT_GenericVector vFonts; -+ buildFonts(this, fs->fonts[j], vFonts); -+ if (vFonts.size() > 0) - FcFontSetAdd(m_pFontSet, fs->fonts[j]); -- _addFont(pFont,NULL); -- } -+ for (UT_uint32 i = 0; i < vFonts.size(); i++) -+ { -+ XAP_UnixFont *pFont = vFonts.getNthItem(i); -+ _addFont(pFont, NULL); -+ } - } -- -- } -+ } - - return true; - } diff --git a/abiword-2.4.6-goffice04.patch b/abiword-2.4.6-goffice04.patch deleted file mode 100644 index 697ad16..0000000 --- a/abiword-2.4.6-goffice04.patch +++ /dev/null @@ -1,64 +0,0 @@ ---- abiword-plugins/tools/abigochart/plugin.m4.goffice04 2006-10-31 16:25:11.000000000 -0500 -+++ abiword-plugins/tools/abigochart/plugin.m4 2008-01-29 01:24:13.000000000 -0500 -@@ -21,9 +21,9 @@ - - # Checks for GOfficeCharts - --LIBGOffice_REQUIRED_VERSION=0.2.1 -+LIBGOffice_REQUIRED_VERSION=0.4.0 - --PKG_CHECK_MODULES(GOFFICE, [libgoffice-1 >= $LIBGOffice_REQUIRED_VERSION],[ -+PKG_CHECK_MODULES(GOFFICE, [libgoffice-0.4 >= $LIBGOffice_REQUIRED_VERSION],[ - ABI_PLUGIN_REPORT([abigochart: okay]) - ],[ ABI_PLUGIN_REPORT([abigochart: error libgoffice >= $LIBGOffice_REQUIRED_VERSION required]) - abi_plugin_disable=yes ---- abiword-plugins/tools/abigochart/unix/AbiGOChart.cpp.goffice04 2006-10-31 16:25:12.000000000 -0500 -+++ abiword-plugins/tools/abigochart/unix/AbiGOChart.cpp 2008-01-29 01:48:06.000000000 -0500 -@@ -72,12 +72,13 @@ - #include - #include - #include --#include -+#include - #include - #include - #include - #include - #include -+#include - #include - #include - #include -@@ -190,8 +191,8 @@ - GOData *data = NULL; - double val; - char sep[2], col_sep[2], *end; -- sep[0] = format_get_arg_sep (); -- col_sep[0] = format_get_col_sep (); -+ sep[0] = go_locale_get_arg_sep (); -+ col_sep[0] = go_locale_get_col_sep (); - sep[1] = col_sep[1]= 0; - char const* str = gtk_entry_get_text (gee); - if (str == NULL) -@@ -1119,7 +1120,7 @@ - { - m_Graph = NULL; - m_Image = NULL; -- m_Renderer = GOG_RENDERER (g_object_new (GOG_RENDERER_PIXBUF_TYPE, NULL)); -+ m_Renderer = GOG_RENDERER (g_object_new (GOG_RENDERER_CAIRO_TYPE, NULL)); - pix_width = pix_height = 0; - width = height = 0; - m_Guru = NULL; -@@ -1189,10 +1190,10 @@ - GdkPixbuf *pixbuf; - pix_width = _width; - pix_height = _height; -- gog_renderer_pixbuf_update (GOG_RENDERER_PIXBUF (m_Renderer), _width, _height, 1.0); -+ gog_renderer_cairo_update (GOG_RENDERER_CAIRO (m_Renderer), _width, _height, 1.0); - if (m_Image) - delete m_Image; -- pixbuf = gog_renderer_pixbuf_get (GOG_RENDERER_PIXBUF (m_Renderer)); -+ pixbuf = gog_renderer_cairo_get_pixbuf (GOG_RENDERER_CAIRO (m_Renderer)); - m_Image = new GR_UnixImage(NULL, pixbuf); - g_object_ref(pixbuf); - m_Image->scaleImageTo(m_pGOMan->getGraphics(),rec); diff --git a/abiword-2.4.6-goffice06.patch b/abiword-2.4.6-goffice06.patch deleted file mode 100644 index 99cc69b..0000000 --- a/abiword-2.4.6-goffice06.patch +++ /dev/null @@ -1,84 +0,0 @@ ---- abiword-plugins/tools/abigochart/plugin.m4~ 2006-10-31 22:25:11.000000000 +0100 -+++ abiword-plugins/tools/abigochart/plugin.m4 2006-11-17 13:33:03.318315000 +0100 -@@ -23,7 +23,7 @@ - - LIBGOffice_REQUIRED_VERSION=0.2.1 - --PKG_CHECK_MODULES(GOFFICE, [libgoffice-1 >= $LIBGOffice_REQUIRED_VERSION],[ -+PKG_CHECK_MODULES(GOFFICE, [libgoffice-0.6 >= $LIBGOffice_REQUIRED_VERSION],[ - ABI_PLUGIN_REPORT([abigochart: okay]) - ],[ ABI_PLUGIN_REPORT([abigochart: error libgoffice >= $LIBGOffice_REQUIRED_VERSION required]) - abi_plugin_disable=yes ---- abiword-plugins/tools/abigochart/unix/AbiGOChart.cpp~ 2006-10-31 22:25:12.000000000 +0100 -+++ abiword-plugins/tools/abigochart/unix/AbiGOChart.cpp 2006-11-17 13:35:44.258315000 +0100 -@@ -72,7 +72,7 @@ - #include - #include - #include --#include -+#include - #include - #include - #include -@@ -1119,7 +1119,7 @@ - { - m_Graph = NULL; - m_Image = NULL; -- m_Renderer = GOG_RENDERER (g_object_new (GOG_RENDERER_PIXBUF_TYPE, NULL)); -+ m_Renderer = GOG_RENDERER (g_object_new (GOG_RENDERER_CAIRO_TYPE, NULL)); - pix_width = pix_height = 0; - width = height = 0; - m_Guru = NULL; -@@ -1189,10 +1189,10 @@ - GdkPixbuf *pixbuf; - pix_width = _width; - pix_height = _height; -- gog_renderer_pixbuf_update (GOG_RENDERER_PIXBUF (m_Renderer), _width, _height, 1.0); -+ gog_renderer_cairo_update (GOG_RENDERER_CAIRO (m_Renderer), _width, _height, 1.0); - if (m_Image) - delete m_Image; -- pixbuf = gog_renderer_pixbuf_get (GOG_RENDERER_PIXBUF (m_Renderer)); -+ pixbuf = gog_renderer_cairo_get_pixbuf (GOG_RENDERER_CAIRO (m_Renderer)); - m_Image = new GR_UnixImage(NULL, pixbuf); - g_object_ref(pixbuf); - m_Image->scaleImageTo(m_pGOMan->getGraphics(),rec); ---- abiword-plugins/configure.orig 2006-11-17 15:05:35.228315000 +0100 -+++ abiword-plugins/configure 2006-11-17 15:14:15.268315000 +0100 -@@ -22834,23 +22834,23 @@ - else - PKG_CONFIG_MIN_VERSION=0.9.0 - if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then -- echo "$as_me:$LINENO: checking for libgoffice-1 >= $LIBGOffice_REQUIRED_VERSION" >&5 --echo $ECHO_N "checking for libgoffice-1 >= $LIBGOffice_REQUIRED_VERSION... $ECHO_C" >&6 -+ echo "$as_me:$LINENO: checking for libgoffice-0.6 >= $LIBGOffice_REQUIRED_VERSION" >&5 -+echo $ECHO_N "checking for libgoffice-0.6 >= $LIBGOffice_REQUIRED_VERSION... $ECHO_C" >&6 - -- if $PKG_CONFIG --exists "libgoffice-1 >= $LIBGOffice_REQUIRED_VERSION" ; then -+ if $PKG_CONFIG --exists "libgoffice-0.6 >= $LIBGOffice_REQUIRED_VERSION" ; then - echo "$as_me:$LINENO: result: yes" >&5 - echo "${ECHO_T}yes" >&6 - succeeded=yes - - echo "$as_me:$LINENO: checking GOFFICE_CFLAGS" >&5 - echo $ECHO_N "checking GOFFICE_CFLAGS... $ECHO_C" >&6 -- GOFFICE_CFLAGS=`$PKG_CONFIG --cflags "libgoffice-1 >= $LIBGOffice_REQUIRED_VERSION"` -+ GOFFICE_CFLAGS=`$PKG_CONFIG --cflags "libgoffice-0.6 >= $LIBGOffice_REQUIRED_VERSION"` - echo "$as_me:$LINENO: result: $GOFFICE_CFLAGS" >&5 - echo "${ECHO_T}$GOFFICE_CFLAGS" >&6 - - echo "$as_me:$LINENO: checking GOFFICE_LIBS" >&5 - echo $ECHO_N "checking GOFFICE_LIBS... $ECHO_C" >&6 -- GOFFICE_LIBS=`$PKG_CONFIG --libs "libgoffice-1 >= $LIBGOffice_REQUIRED_VERSION"` -+ GOFFICE_LIBS=`$PKG_CONFIG --libs "libgoffice-0.6 >= $LIBGOffice_REQUIRED_VERSION"` - echo "$as_me:$LINENO: result: $GOFFICE_LIBS" >&5 - echo "${ECHO_T}$GOFFICE_LIBS" >&6 - else -@@ -22858,7 +22858,7 @@ - GOFFICE_LIBS="" - ## If we have a custom action on failure, don't print errors, but - ## do set a variable so people can do so. -- GOFFICE_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libgoffice-1 >= $LIBGOffice_REQUIRED_VERSION"` -+ GOFFICE_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libgoffice-0.6 >= $LIBGOffice_REQUIRED_VERSION"` - - fi - diff --git a/abiword-2.4.6-toc-layout.patch b/abiword-2.4.6-toc-layout.patch deleted file mode 100644 index 39b53a7..0000000 --- a/abiword-2.4.6-toc-layout.patch +++ /dev/null @@ -1,27 +0,0 @@ -r21892 | sum1 | 2007-09-04 01:28:58 +0200 (Tue, 04 Sep 2007) | 4 lines -Fix Red Hat Bug 248103, TOC layout crash when importing RTF. - ---- abiword-2.4.6.orig/abi/src/text/fmt/xp/fl_DocLayout.cpp 2007-09-04 17:19:39.000000000 +0200 -+++ abiword-2.4.6/abi/src/text/fmt/xp/fl_DocLayout.cpp 2007-09-04 17:23:30.000000000 +0200 -@@ -595,14 +595,19 @@ void FL_DocLayout::fillLayouts(void) - fl_ContainerLayout * pCL = pLastSec->getLastLayout(); - fl_BlockLayout * pBL = NULL; - bool bRebreak = false; -- if(pCL->getContainerType() == FL_CONTAINER_BLOCK) -+ if(pCL && (pCL->getContainerType() == FL_CONTAINER_BLOCK)) -+ - { - pBL = static_cast(pCL); - } -- else -+ else if(pCL) - { - pBL = pCL->getPrevBlockInDocument(); - } -+ else -+ { -+ UT_ASSERT_HARMLESS(pCL); -+ } - if(pBL) - { - fp_Line * pLine = static_cast(pBL->getLastContainer()); diff --git a/abiword-2.6.0-boolean.patch b/abiword-2.6.0-boolean.patch new file mode 100644 index 0000000..9f226c0 --- /dev/null +++ b/abiword-2.6.0-boolean.patch @@ -0,0 +1,13 @@ +diff -u -r abiword-2.6.0.orig/src/text/ptbl/xp/pd_Style.h abiword-2.6.0/src/text/ptbl/xp/pd_Style.h +--- abiword-2.6.0.orig/src/text/ptbl/xp/pd_Style.h 2008-03-18 23:16:20.000000000 +0100 ++++ abiword-2.6.0/src/text/ptbl/xp/pd_Style.h 2008-03-25 17:14:23.000000000 +0100 +@@ -23,6 +23,9 @@ + #ifndef PD_STYLE_H + #define PD_STYLE_H + ++#ifndef FALSE ++#define FALSE 0 ++#endif /* FALSE */ + #include "ut_types.h" + #include "pt_Types.h" + #include "ut_xml.h" diff --git a/abiword-2.6.0-desktop.patch b/abiword-2.6.0-desktop.patch new file mode 100644 index 0000000..43e9488 --- /dev/null +++ b/abiword-2.6.0-desktop.patch @@ -0,0 +1,12 @@ +diff -u -r abiword-2.6.0.orig/abiword.desktop abiword-2.6.0/abiword.desktop +--- abiword-2.6.0.orig/abiword.desktop 2008-03-18 23:17:39.000000000 +0100 ++++ abiword-2.6.0/abiword.desktop 2008-03-25 16:45:43.000000000 +0100 +@@ -7,7 +7,7 @@ + StartupNotify=true + Encoding=UTF-8 + X-Desktop-File-Install-Version=0.9 +-MimeType=application/x-abiword;text/x-abiword;text/x-xml-abiword;text/plain;application/msword;application/rtf;application/vnd.plain;application/xhtml+xml;text/html;application/x-crossmark;application/docbook+xml;application/x-t602;application/vnd.oasis.opendocument.text;application/vnd.sun.xml.writer;application/vnd.stardivision.writer;text/vnd.wap.wml;application/wordperfect6;application/wordperfect5.1; ++MimeType=application/x-abiword;text/x-abiword;text/x-xml-abiword;text/plain;application/msword;application/rtf;application/vnd.plain;application/xhtml+xml;text/html;application/x-crossmark;application/docbook+xml;application/x-t602;application/vnd.oasis.opendocument.text;application/vnd.sun.xml.writer;application/vnd.stardivision.writer;text/vnd.wap.wml;application/wordperfect6;application/wordperfect5.1;application/x-mif;application/x-kword;application/x-mswrite;application/x-applix-word;application/vnd.wordperfect; + Name=AbiWord + GenericName=Word Processor + Comment=AbiWord Word Processor diff --git a/abiword-2.6.0-libabiword.patch b/abiword-2.6.0-libabiword.patch new file mode 100644 index 0000000..23dcd71 --- /dev/null +++ b/abiword-2.6.0-libabiword.patch @@ -0,0 +1,41 @@ +diff -u -r -N abiword-2.6.0.orig/src/wp/main/unix/libabiword.h abiword-2.6.0/src/wp/main/unix/libabiword.h +--- abiword-2.6.0.orig/src/wp/main/unix/libabiword.h 1970-01-01 01:00:00.000000000 +0100 ++++ abiword-2.6.0/src/wp/main/unix/libabiword.h 2008-03-25 18:19:02.000000000 +0100 +@@ -0,0 +1,37 @@ ++/* The AbiWord library ++ * ++ * Copyright (C) 2006 Robert Staudinger ++ * ++ * This program is free software; you can redistribute it and/or ++ * modify it 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. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program; if not, write to the Free Software ++ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA ++ * 02111-1307, USA. ++ */ ++ ++#ifndef LIBABIWORD_H ++#define LIBABIWORD_H ++ ++#include ++#include ++#include ++ ++G_BEGIN_DECLS ++ ++void libabiword_init (int argc, const char **argv); ++/* used by the python binding, e.g. */ ++void libabiword_init_noargs (); ++void libabiword_shutdown (); ++ ++G_END_DECLS ++ ++#endif /* LIBABIWORD_H */ diff --git a/abiword-2.6.0-textbox.patch b/abiword-2.6.0-textbox.patch new file mode 100644 index 0000000..dd1cf90 --- /dev/null +++ b/abiword-2.6.0-textbox.patch @@ -0,0 +1,12 @@ +diff -u -r abiword-2.6.0.orig/src/text/fmt/xp/fp_FrameContainer.cpp abiword-2.6.0/src/text/fmt/xp/fp_FrameContainer.cpp +--- abiword-2.6.0.orig/src/text/fmt/xp/fp_FrameContainer.cpp 2008-03-18 23:16:22.000000000 +0100 ++++ abiword-2.6.0/src/text/fmt/xp/fp_FrameContainer.cpp 2008-03-27 15:05:51.000000000 +0100 +@@ -448,7 +448,7 @@ + void fp_FrameContainer::_drawLine (const PP_PropertyMap::Line & style, + UT_sint32 left, UT_sint32 top, UT_sint32 right, UT_sint32 bot,GR_Graphics * pGr) + { +- GR_Painter painter(getGraphics()); ++ GR_Painter painter(pGr); + + if (style.m_t_linestyle == PP_PropertyMap::linestyle_none) + return; // do not draw diff --git a/abiword-2.6.0-windowshelppaths.patch b/abiword-2.6.0-windowshelppaths.patch new file mode 100644 index 0000000..45a1bbc --- /dev/null +++ b/abiword-2.6.0-windowshelppaths.patch @@ -0,0 +1,254 @@ +diff -u -r abiword-docs-2.6.0.orig/ABW/fr-FR/howto/howtoword.abw abiword-docs-2.6.0/ABW/fr-FR/howto/howtoword.abw +--- abiword-docs-2.6.0.orig/ABW/fr-FR/howto/howtoword.abw 2008-03-18 23:19:26.000000000 +0100 ++++ abiword-docs-2.6.0/ABW/fr-FR/howto/howtoword.abw 2008-03-25 16:17:20.000000000 +0100 +@@ -23,7 +23,7 @@ +

Il est presque inévitable qu'à un certain moment, vous aurez le besoin d'expédier un document que vous avez créé avec AbiWord à une personne utilisant Microsoft Word ou ouvrir un document créé avec Microsoft Word avec AbiWord. Heureusement, il est facile de réaliser ces transferts.

+

Visualiser un document AbiWord avec Microsoft Word

+

Jusqu'à ce que Microsoft annonce le support des fichiers d'AbiWord, les documents créés avec AbiWord nécessiteront d'être exportés dans un format que Word peut lire. L'enregistrement au format Rich Text Format permet de réaliser facilement cette exportation.

+-

++

+

+

Le format Rich Text est couramment utilisé par les produits Microsoft Office et ils n'auront aucune difficulté à importer les documents enregistrés ainsi.

+

Visualiser les documents Word avec AbiWord

+@@ -31,7 +31,7 @@ +

Si vous rencontrez des problèmes, demandez à l'utilisateur de Word d'enregistrer le document au format Rich Text Format (.rtf). Toutes les versions de Microsoft Word peuvent le faire et AbiWord peut ouvrir les fichiers RTF de manière fiable.

+ + +- ++ + iVBORw0KGgoAAAANSUhEUgAAAhwAAAKXCAYAAADJiZNnAAAABmJLR0QA/wD/AP+gvaeTAAAA + CXBIWXMAAAsSAAALEgHS3X78AAAAB3RJTUUH0gUSDDMylHTKNAAAIABJREFUeJzsvV+oJcl5 + 4PlVcwzngh6qG2TUxgtbl9lmu+7QuOvONu6usbBKEuw0eGGEdmE07MO4C4tZ2TMsMy9m9bY9 +diff -u -r abiword-docs-2.6.0.orig/ABW/fr-FR/interface/dialogreplace.abw abiword-docs-2.6.0/ABW/fr-FR/interface/dialogreplace.abw +--- abiword-docs-2.6.0.orig/ABW/fr-FR/interface/dialogreplace.abw 2008-03-18 23:19:26.000000000 +0100 ++++ abiword-docs-2.6.0/ABW/fr-FR/interface/dialogreplace.abw 2008-03-25 16:17:20.000000000 +0100 +@@ -16,7 +16,7 @@ + +
+

Dialogue remplacer

+-

++

+

Rechercher

+

Entrez le mot que vous désirez rechercher dans cette boîte. Il s'agit de la chaîne de recherche. Cette commande recherche la chaîne de caractères ou de nombres que vous entrez. Ainsi, si vous recherchez en, vous trouverez les deux lettres au milieu du mot dent tout autant que le mot en.

+

Respecter la casse

+@@ -33,7 +33,7 @@ +

Ce bouton ferme le dialogue Remplacer.

+
+ +- ++ + iVBORw0KGgoAAAANSUhEUgAAAdkAAACqCAIAAABu5KKOAAAaMElEQVR4nO2dX4gkx33Hfxfa + UAMXmDEyaPWknYcj2jFHtBMd6BaF6BzlQdgPtslDTn7KiRjspxDpIfjyEklvtgPByoOQYgg+ + P8TS6cGnS/BFa5DZPdAxu7Dy3JhE3CxEeJbo2G7wQf/ABZuHqq6urv4zPT3d23u33w/LUl1d +diff -u -r abiword-docs-2.6.0.orig/ABW/fr-FR/interface/workspace.abw abiword-docs-2.6.0/ABW/fr-FR/interface/workspace.abw +--- abiword-docs-2.6.0.orig/ABW/fr-FR/interface/workspace.abw 2008-03-18 23:19:25.000000000 +0100 ++++ abiword-docs-2.6.0/ABW/fr-FR/interface/workspace.abw 2008-03-25 16:17:20.000000000 +0100 +@@ -23,24 +23,24 @@ +
+

L'espace de travail d'AbiWord

+

AbiWord a une apparence très similaire à d'autres traitements de texte, ce qui, nous l'espérons, met à l'aise toute personne qui débute avec le logiciel.

+-

++

+

L'interface familière devrait permettre à la plupart des personnes de démarrer le travail immédiatement. Cependant, certaines caractéristiques sont peut-être nouvelles.

+

Titre de fenêtre

+-

++

+

La fenêtre de titre est similaire à cette de toute autre application, avec une différence toutefois. Notez le caractère * près de Document10. L'astérique signifie que Document10 a été modifié. Ceci fourni un manière simple d'identifier si le document doit être enregistré.

+

Les barres de fonction

+-

Voici les trois plus importantes barres de fonctions. La première, nommée barre de menu, est le meilleur endroit pour se familiariser avec AbiWord. Il est préférable d'y débuter l'exploration des menus pour saisir ce que AbiWord peut faire avec les documents.

++

Voici les trois plus importantes barres de fonctions. La première, nommée barre de menu, est le meilleur endroit pour se familiariser avec AbiWord. Il est préférable d'y débuter l'exploration des menus pour saisir ce que AbiWord peut faire avec les documents.

+

La seconde est la barre d'outils standard et la troisième (au bas) est la barre d'outils de mise en forme.

+

Manipuler les barres

+

AbiWord permet de cacher les barres. Si certaines manquent ou ne sont pas requises vérifiez le menu Affichage > Barres d'outils.

+-

++

+

Barre de saisie

+

+

Pour ceux qui exécutent AbiWord sous GNOME, La barre de saisie localisée à l'extrémité gauche de chaque barre d'outils représente une manières simple offerte à chacun de modifier l'interface à leur convenance. Cliquez la barre de saisie et déplacez-là. La barre d'outils suivra la souris, permettant même à la barre d'outil de survoler une partie quelconque de l'écran.

+

Barre d'état

+

+

La barre d'état permet une vue rapide de l'état du document. A la gauche, AbiWord note la page courante. La boîte du milieu, qui est habituellement vide, affiche un message d'aide rapide décrivant l'option de menu courante.

+-

++

+

Les règles

+

+

En employant les règles, il devient facile de fixer les marges de la page et les tabulations.

+@@ -49,7 +49,7 @@ +

+
+ +- ++ + iVBORw0KGgoAAAANSUhEUgAAAogAAAGNCAIAAAAdDhfDAAAgAElEQVR4nOy9bWwcx5ku+mjR + vqgJmMWMoSw4gh1oCFnIkLZhkhtBGkbBmjoOYDpZwKIdwGZ8FgnlBDYdX2Qt70EiO4u7trPY + WE5wEmuDxKKDbEQZiCXqIpaYQDozOpB2hoKU4QSSyTFsg0NsBDcRE5rGCeEuXDWg+6O6q6ur +@@ -732,7 +732,7 @@ + Wou0TTikLDRhjmgVAQUDQ4DAoNDRir5zy+NoJmoB6UympdYFSExwmp8h7V3X9DzWmFzStIMW + iGVuXG2lztIQVvgtffSrFKSfSwNqoDCo/g+anqxAe88lpQAAAABJRU5ErkJggg== + +- ++ + iVBORw0KGgoAAAANSUhEUgAAAikAAAEyCAIAAACwCNeMAAAACXBIWXMAAABEAAAARACdvuRJ + AABTv0lEQVR42u29f2wcx5nn/bXQflGzYF4MDSfgGEngIbJGKCbGSrw1LCoJTtRqcWHWC1hO + Foi8uRf2yA4SOTns2flj3yR3eC82Du+beA/5oQTrFWXsxT+AtS0DF1kXREdqYYekYYecQAo1 +@@ -1135,7 +1135,7 @@ + MThhNzQ3OWNiNDVjMWM4ZjU4ODEwMjAxODdiNmZkOGRmYmNlZGIwNjWQ4/dNAAAAAElFTkSu + QmCC + +- ++ + iVBORw0KGgoAAAANSUhEUgAAAnwAAABeCAIAAAA2dF4VAAAACXBIWXMAAABEAAAARACdvuRJ + AABD6UlEQVR42u29fYwc1Zkv/HNUXFVHzlWPBdG0BZG7BRY9DVZmOrGYmQVdZjbRzZi9EraJ + BEPeVRgDAjtIiU1WiSHRrk1WG5tEy8VEITNcZRk7UrDNVRhPInO7/cpst9FAz0SGno4ATVvB +@@ -1496,7 +1496,7 @@ + DARcAEBsLLAFAABFC65ZAT5ljHl7Cpt/HGtWAABrMLOCaDgEBABIgTUriEbi4lkAQPkIK4iC + QzsAgFT+AnafvftOpg+NAAAAAElFTkSuQmCC + +- ++ + iVBORw0KGgoAAAANSUhEUgAAAoYAAAAWCAIAAADSEcpEAAAACXBIWXMAAABEAAAARACdvuRJ + AAAKN0lEQVR42u2dXYjc1hXH/wEFjmACEriwAy10TAlxHEq9bgO2ScBx85AtLsROXtYkD0me + 4rSQ2n0o5CnYD/1wCiHbQogTKN0EanYWmnobanZcajxbutkZ8McqtCYa6IIGvFgXMqADvg99 +@@ -1550,7 +1550,7 @@ + N2NlNzE0YWQwMjdlM2M5MWZiMjk0ZTc2ZDNlNDU2ZmQxMjFjZmE4ODZiNWRlMGUzZTNmZjhm + ZTJhZTY0MmU4HyCiUgAAAABJRU5ErkJggg== + +- ++ + iVBORw0KGgoAAAANSUhEUgAAAm8AAACbCAIAAAC7yOv5AAAACXBIWXMAAABEAAAARACdvuRJ + AAAqpUlEQVR42u2df2hlx5XnT4cbqAcaeDJOkGB3icTSxFII69Zug92TMN2eXkgvXoiT/LEd + ZiBW40DayZCN88eS5J9J+4/9kVmSuGdYY7VhZ+3ABsuwiXuH9LZ6iSMpuEfS0G31M4nRE6yZ +diff -u -r abiword-docs-2.6.0.orig/ABW/pl-PL/howto/howtoword.abw abiword-docs-2.6.0/ABW/pl-PL/howto/howtoword.abw +--- abiword-docs-2.6.0.orig/ABW/pl-PL/howto/howtoword.abw 2008-03-18 23:19:15.000000000 +0100 ++++ abiword-docs-2.6.0/ABW/pl-PL/howto/howtoword.abw 2008-03-25 16:17:21.000000000 +0100 +@@ -24,7 +24,7 @@ +

Podgląd dokumentów AbiWorda w programie Microsoft Word

+

Jakkolwiek Microsoft zapowiada wsparcie dla plików AbiWorda, to przede wszystkim dokumenty tworzone w AbiWordzie powinny być eksportowane do formatu czytelnego dla programu Microsoft Word. Najłatwiej to zrobić przez zapisanie pliku w postaci Rich Text Format.

+

+-

++

+

+

Rich Text Format często jest używany przez pakiet oprogramowania biurowego firmy Microsoft i nie będzie problemów z importem dokumentów zapisanych w ten sposób.

+

Podgląd dokumentów Microsoft Word w AbiWordzie

+@@ -32,7 +32,7 @@ +

Jeśli napotykasz problemy, to poproś użytkownika programu Microsoft Word, aby zapisywał dokumenty jako Rich Text Format (.rtf). Wszystkie wersje programu Microsoft Word mogą zapisywać pliki w tym formacie, a AbiWord potrafi wiernie odczytywać pliki typu RTF.

+ + +- ++ + iVBORw0KGgoAAAANSUhEUgAAAl0AAAGYCAIAAAGAKvBwAAAACXBIWXMAAAsSAAALEgHS3X78 + AAAACXRFWHRDb21tZW50AACJKo0GAAAgAElEQVR4nOxdCXQUxbru6Z59Jvu+IU9Qr7jh8Yrg + Coq4IKiIinAFFFxYghCQhASyEQj7GgKB7CsJgYCAEJLM9ARCUNGrjyvi9TxChCBclsBlMWzp +diff -u -r abiword-docs-2.6.0.orig/ABW/pl-PL/interface/workspace.abw abiword-docs-2.6.0/ABW/pl-PL/interface/workspace.abw +--- abiword-docs-2.6.0.orig/ABW/pl-PL/interface/workspace.abw 2008-03-18 23:19:16.000000000 +0100 ++++ abiword-docs-2.6.0/ABW/pl-PL/interface/workspace.abw 2008-03-25 16:17:21.000000000 +0100 +@@ -25,24 +25,24 @@ +

Obszar roboczy AbiWorda

+

Obszar roboczy jest podobny do tych, jakie znamy z innych edytorów tekstu. Dlatego każdy nowy użytkownik AbiWorda może się czuć jak u siebie w domu.

+

+-

++

+

+

Znajomy interfejs pozwala większości użytkownikom od razu rozpocząć pracę. Tym niemniej niektóre możliwości będą nowością.

+

+

Okno tytułu

+

+-

++

+

+

Okno tytułu jest podobne do okien innych aplikacji, z jedną jednak różnicą. Zwóć uwagę na gwiazdkę * obok “Dokument_10“. Gwiazdka oznacza, że “Dokument_10“ został zmodyfikowany. W ten prosty sposób AbiWord podpowiada ci, że dokument powinien być zapisany.

+

Paski funkcji

+-

++

+

+

Oto trzy podstawowe paski funkcji. Pierwszy, nazywany Paskiem Menu, to najlepsze miejsce, by zapoznać się z AbiWordem. Najlepiej po prostu przejrzyj każde menu, wtedy poznasz wszystkie komendy, jakich AbiWord może użyć do dokumentów.

+

Drugi to pasek “Standardowy”, trzeci z wyżej pokazanych (na dole) to pasek "Formatowanie".

+

Paski robocze

+

AbiWord pozwala na ukrywanie pasków narzędzi. Jeśli któregoś brakuje albo nie jest potrzebny, sprawdź w Widok > Paski narzędzi.

+

+-

++

+

Pasek uchwytu

+

+

+@@ -50,14 +50,14 @@ +

Użytkownicy, którzy uruchamiają AbiWorda w środowisku GNOME, znajdą pasek uchwytu umieszczony na skraju lewej części każdego z pasków narzędziowych, który pozwala w prosty sposób zmodyfikować interfejs wedle życzenia. Kliknij na pasek uchwytu i przeciągnij. Pasek narzędziowy będzie przesuwać się wzdłuż toru myszki, może nawet wisieć nad dowolną częścią ekranu.

+

Pasek statusu

+

+-

++

+

+

W pasku statusu znajdziesz skrótowy opis statusu dokumentu. W lewej części paska AbiWord wyświetla kolejny numer strony oraz liczbę wszystkich stron. Następnie w środkowej części, która najczęściej jest pusta, wyświetlany jest krótki pomocniczy opis bieżącej opcji menu. W prawej części paska podany jest tryb pracy klawiatury (+INS, czyli tryb wstawiania, albo -ins, czyli tryb zastępowania) oraz nazwa aktualnego szablonu.

+

+-

++

+

Linijka

+

+-

++

+

+

Używając linijki możesz w łatwy sposób definiować na stronie marginesy oraz tabulatory.

+ +@@ -65,7 +65,7 @@ +

+ + +- ++ + iVBORw0KGgoAAAANSUhEUgAAApwAAAFhCAIAAAElyt0+AAAACXBIWXMAAAsSAAALEgHS3X78 + AAAACXRFWHRDb21tZW50AACJKo0GAAAgAElEQVR4nOxdCXwURdbvLPC54IeIuMoKArKcUQgi + d2JABIGVKxwGVrmPGMQQzklmJpcCIUBMgpBwJBzBEI4glwR0RTySzISEzAyZJIC6IB6suwLK +@@ -1458,7 +1458,7 @@ + Wou0TTikLDRhjmgVAQUDQ4DAoNDRir5zy+NoJmoB6UympdYFSExwmp8h7V3X9DzWmFzStIMW + iGVuXG2lztIQVvgtffSrFKSfSwNqoDCo/g+anqxAe88lpQAAAABJRU5ErkJggg== + +- ++ + iVBORw0KGgoAAAANSUhEUgAAAp8AAAAYCAIAAAFEpzGAAAAACXBIWXMAAAsSAAALEgHS3X78 + AAAACXRFWHRDb21tZW50AACJKo0GAAAgAElEQVR4nOx9d1RUWbZ38TqYMAdUkAKabCBoS5As + qKAiKIIgWck5JwkigkgWEFSiiIqCtpjaHFqSIlSBobvtoHaY6fj19Dezpue9Wa++fc6+99at +@@ -1824,7 +1824,7 @@ + U3NkC/pNXf3TzsJ2jxwsz3aUR7tKcWkNGacs2/619xjliewpfDI4XsC01wCb6ZPN6En3gjNT + F/m4k8smfLv/D9XFSL9vOncQAAAAAElFTkSuQmCC + +- ++ + iVBORw0KGgoAAAANSUhEUgAAAp0AAADuCAIAAAGDmRu5AAAACXBIWXMAAAsSAAALEgHS3X78 + AAAACXRFWHRDb21tZW50AACJKo0GAAAgAElEQVR4nOxdCVQUx7oeAi5EcXlZTKKXQUUJmgii + kVUkUURwQdwAgwiIwKCAKLLIooiiILKIgiKCgrsoKhHUuAvMsM4gi8bk5ZpEk6OJeZrz7kty +@@ -2753,7 +2753,7 @@ + rHHd5lpt9kxeQWueBlaZZ/Fw+ux83+U9jEtmQ0dDO9V/An0RGn6kluj/H0TjWnMwPK11AAAA + AElFTkSuQmCC + +- ++ + iVBORw0KGgoAAAANSUhEUgAAApwAAAAXCAIAAAFexjhWAAAACXBIWXMAAAsSAAALEgHS3X78 + AAAACXRFWHRDb21tZW50AACJKo0GAAAQ2ElEQVR4nO1dC1fbuBIOr+7v3W0pPUtS2P61S3Cc + 0NiOQ7g/5HZpu6fkzswnjR628yKQkPU5g4+QZVmR5q0ZuTPJhkWRFvmoCXJq0Hz3hSAvgn/L +@@ -2837,7 +2837,7 @@ + pHc9YRw/VddzPPJlb69v8xK8bi3Qo7dknmEXttcXuibeNbhLgrjSHv6qx6vuxdUlifPRnA9/ + vvh8+bGUMol5AkbjCX+D/v/6OPv+i4Ym1QAAAABJRU5ErkJggg== + +- ++ + iVBORw0KGgoAAAANSUhEUgAAAp8AAABWCAIAAAFx9VqcAAAACXBIWXMAAAsSAAALEgHS3X78 + AAAACXRFWHRDb21tZW50AACJKo0GAAAgAElEQVR4nOx9CXxU1bn4HRJwa23rv699z7a2tX1t + ta226nOBWLVqfW3t5trF1rpVpVpbBFlmEpBFUURZFZCloICgoIKAooBCJpN1lsxkwhJIWAOU +@@ -3416,7 +3416,7 @@ + bOnGe+2M3XYot2UDS4L5O8omnlXu+gHXqLwXOB02sXB53k22Z9RfqVlmje7/A8GWRyS/OvHV + AAAAAElFTkSuQmCC + +- ++ + iVBORw0KGgoAAAANSUhEUgAAA1IAAAAhCAIAAAErHT00AAAACXBIWXMAAAsSAAALEgHS3X78 + AAAACXRFWHRDb21tZW50AACJKo0GAAAN60lEQVR4nO1djXLbOA6WNnmmvb1r76l2u0lrqd2H + c+OkzkRy7Tj3KJ26tg8kJIrWD0VLlAjZwHyjcWSGhiASBEkADN69/xejD4Jt8jWO7uL4A3xA +@@ -3486,7 +3486,7 @@ + 5Nm7YpO32pdkR7qtS7ijYei3Sa21MD/MD/PD/DA/18gPH/dai3qzrxHWK0Y91/kYVcAsR85m + FvqatoL+5yYxmH0MBoPBYFwa2MizxP8Bf0pzQLOvs0QAAAAASUVORK5CYII= + +- ++ + iVBORw0KGgoAAAANSUhEUgAAAVQAAACgCAIAAAGrgzPPAAAACXBIWXMAAAsSAAALEgHS3X78 + AAAACXRFWHRDb21tZW50AACJKo0GAAAgAElEQVR4nLRcC3CURbb+h8lr8k4IRALOPwmQ18S8 + ABHxcVnBSMTwlofZSEiCGALy2EgkExRlQQQf4FvR0t3VXXdXry513dq61i2rbkIICZkZEhK3 diff --git a/abiword-extras-2.6.0-destdir.patch b/abiword-extras-2.6.0-destdir.patch new file mode 100644 index 0000000..e822b17 --- /dev/null +++ b/abiword-extras-2.6.0-destdir.patch @@ -0,0 +1,30 @@ +diff -u -r abiword-extras-2.6.0.orig/clipart/Makefile.am abiword-extras-2.6.0/clipart/Makefile.am +--- abiword-extras-2.6.0.orig/clipart/Makefile.am 2008-03-18 23:18:48.000000000 +0100 ++++ abiword-extras-2.6.0/clipart/Makefile.am 2008-03-26 13:43:30.000000000 +0100 +@@ -1,5 +1,5 @@ + +-clipartdir = $(DESTDIR)/$(ABIWORD_EXTRAS_PKGDATADIR)/clipart ++clipartdir = $(ABIWORD_EXTRAS_PKGDATADIR)/clipart + clipart_DATA = \ + book.png \ + chip.png \ +diff -u -r abiword-extras-2.6.0.orig/dictionary/Makefile.am abiword-extras-2.6.0/dictionary/Makefile.am +--- abiword-extras-2.6.0.orig/dictionary/Makefile.am 2008-03-18 23:18:47.000000000 +0100 ++++ abiword-extras-2.6.0/dictionary/Makefile.am 2008-03-26 13:43:43.000000000 +0100 +@@ -1,5 +1,5 @@ + +-dictionarydir = $(DESTDIR)/$(ABIWORD_EXTRAS_PKGDATADIR)/dictionary ++dictionarydir = $(ABIWORD_EXTRAS_PKGDATADIR)/dictionary + + if BIGENDIAN + hash = BigEndian32.american.hash +diff -u -r abiword-extras-2.6.0.orig/templates/Makefile.am abiword-extras-2.6.0/templates/Makefile.am +--- abiword-extras-2.6.0.orig/templates/Makefile.am 2008-03-18 23:18:49.000000000 +0100 ++++ abiword-extras-2.6.0/templates/Makefile.am 2008-03-26 13:43:51.000000000 +0100 +@@ -1,5 +1,5 @@ + +-templatesdir = $(DESTDIR)/$(ABIWORD_EXTRAS_PKGDATADIR)/templates ++templatesdir = $(ABIWORD_EXTRAS_PKGDATADIR)/templates + templates_DATA = \ + A4.awt \ + Business-Letter.awt \ diff --git a/abiword-plugins-2.6.0-boolean.patch b/abiword-plugins-2.6.0-boolean.patch new file mode 100644 index 0000000..863792e --- /dev/null +++ b/abiword-plugins-2.6.0-boolean.patch @@ -0,0 +1,26 @@ +diff -u -r abiword-plugins-2.6.0.orig/tools/abigrammar/linkgrammarwrap/LinkGrammarWrap.h abiword-plugins-2.6.0/tools/abigrammar/linkgrammarwrap/LinkGrammarWrap.h +--- abiword-plugins-2.6.0.orig/tools/abigrammar/linkgrammarwrap/LinkGrammarWrap.h 2008-03-18 23:18:02.000000000 +0100 ++++ abiword-plugins-2.6.0/tools/abigrammar/linkgrammarwrap/LinkGrammarWrap.h 2008-03-25 17:16:04.000000000 +0100 +@@ -20,6 +20,9 @@ + #ifndef __LinkGrammarWrap_h__ + #define __LinkGrammarWrap_h__ + ++#ifndef TRUE ++#define TRUE 1 ++#endif /* TRUE */ + extern "C" { + #include + } +diff -u -r abiword-plugins-2.6.0.orig/wp/impexp/OpenDocument/imp/xp/ODi_Style_Style.h abiword-plugins-2.6.0/wp/impexp/OpenDocument/imp/xp/ODi_Style_Style.h +--- abiword-plugins-2.6.0.orig/wp/impexp/OpenDocument/imp/xp/ODi_Style_Style.h 2008-03-18 23:18:20.000000000 +0100 ++++ abiword-plugins-2.6.0/wp/impexp/OpenDocument/imp/xp/ODi_Style_Style.h 2008-03-25 17:16:04.000000000 +0100 +@@ -23,6 +23,9 @@ + #ifndef _ODI_STYLE_STYLE_H_ + #define _ODI_STYLE_STYLE_H_ + ++#ifndef TRUE ++#define TRUE 1 ++#endif /* TRUE */ + // Internal includes + #include "ODi_ListenerState.h" + diff --git a/abiword-plugins-2.6.0-regression.patch b/abiword-plugins-2.6.0-regression.patch new file mode 100644 index 0000000..97282b7 --- /dev/null +++ b/abiword-plugins-2.6.0-regression.patch @@ -0,0 +1,11 @@ +diff -u -r abiword-plugins-2.6.0.orig/tools/abicollab/core/session/xp/AbiCollab_Regression.cpp abiword-plugins-2.6.0/tools/abicollab/core/session/xp/AbiCollab_Regression.cpp +--- abiword-plugins-2.6.0.orig/tools/abicollab/core/session/xp/AbiCollab_Regression.cpp 2008-03-18 23:18:06.000000000 +0100 ++++ abiword-plugins-2.6.0/tools/abicollab/core/session/xp/AbiCollab_Regression.cpp 2008-03-25 21:22:16.000000000 +0100 +@@ -19,6 +19,7 @@ + */ + + #include ++#include + + #include "ut_debugmsg.h" + #include diff --git a/abiword-plugins-2.6.0-xmpp.patch b/abiword-plugins-2.6.0-xmpp.patch new file mode 100644 index 0000000..8c28dbd --- /dev/null +++ b/abiword-plugins-2.6.0-xmpp.patch @@ -0,0 +1,11 @@ +diff -u -r abiword-plugins-2.6.0.orig/tools/abicollab/backends/xmpp/xp/XMPPAccountHandler.h abiword-plugins-2.6.0/tools/abicollab/backends/xmpp/xp/XMPPAccountHandler.h +--- abiword-plugins-2.6.0.orig/tools/abicollab/backends/xmpp/xp/XMPPAccountHandler.h 2008-03-18 23:18:07.000000000 +0100 ++++ abiword-plugins-2.6.0/tools/abicollab/backends/xmpp/xp/XMPPAccountHandler.h 2008-03-25 20:40:10.000000000 +0100 +@@ -21,6 +21,7 @@ + #ifndef __XMPPACCOUNTHANDLER__ + #define __XMPPACCOUNTHANDLER__ + ++#include + #include + #include + diff --git a/abiword.spec b/abiword.spec index fa8575e..8e9b310 100644 --- a/abiword.spec +++ b/abiword.spec @@ -1,11 +1,18 @@ +%define majorversion 2 +%define minorversion 6 +%define microversion 0 + Summary: The AbiWord word processor Name: abiword -Version: 2.4.6 -Release: 8%{?dist} +Version: 2.6.0 +Release: 1%{?dist} Epoch: 1 Group: Applications/Editors License: GPLv2+ -Source: http://www.abisource.com/downloads/abiword/%{version}/source/abiword-%{version}.tar.bz2 +Source0: http://abisource.com/downloads/abiword/%{version}/source/abiword-%{version}.tar.gz +Source1: http://abisource.com/downloads/abiword/%{version}/source/abiword-plugins-%{version}.tar.gz +Source2: http://abisource.com/downloads/abiword/%{version}/source/abiword-extras-%{version}.tar.gz +Source3: http://abisource.com/downloads/abiword/%{version}/source/abiword-docs-%{version}.tar.gz Source11: abiword.mime Requires: mathml-fonts Requires: link-grammar >= 4.2.2 @@ -13,7 +20,7 @@ Requires: link-grammar >= 4.2.2 BuildRoot: %{_tmppath}/%{name}-%{version}-root BuildRequires: aspell-devel libpng-devel BuildRequires: desktop-file-utils -BuildRequires: fribidi-devel, enchant-devel +BuildRequires: fribidi-devel, enchant-devel, wv-devel BuildRequires: libgnomeprintui22-devel BuildRequires: autoconf, libtool @@ -25,49 +32,77 @@ BuildRequires: ots-devel >= 0.4.2 BuildRequires: libwpd-devel >= 0.8.0 BuildRequires: librsvg2-devel BuildRequires: libwmf-devel -BuildRequires: aiksaurus-gtk-devel >= 1.2.1 +BuildRequires: aiksaurus-devel, aiksaurus-gtk-devel BuildRequires: link-grammar-devel >= 4.2.2 -BuildRequires: gtkmathview-devel >= 0.7.5 +BuildRequires: gtkmathview-devel >= 0.7.5, flex, bison BuildRequires: goffice04-devel +BuildRequires: boost-devel +BuildRequires: loudmouth-devel +%if 0%{?fedora} >= 9 +BuildRequires: asio-devel >= 0.3.8 +%endif # gnome build deps BuildRequires: libgnomeui-devel URL: http://www.abisource.com/ -Patch0: abiword-2.0.9-windowshelppaths.patch -Patch1: abiword-2.4.4-desktop.patch -Patch2: abiword-2.4.6-fontmanager.patch -Patch3: abiword-2.4.6-toc-layout.patch -Patch4: abiword-2.4.6-boolean.patch -Patch5: abiword-2.4.6-goffice04.patch +Patch0: abiword-2.6.0-windowshelppaths.patch +Patch1: abiword-2.6.0-desktop.patch +Patch2: abiword-2.6.0-boolean.patch +Patch3: abiword-plugins-2.6.0-boolean.patch +Patch4: abiword-2.6.0-libabiword.patch +Patch5: abiword-plugins-2.6.0-xmpp.patch +Patch6: abiword-plugins-2.6.0-regression.patch +Patch7: abiword-extras-2.6.0-destdir.patch +Patch8: abiword-2.6.0-textbox.patch %description -AbiWord is a cross-platform Open Source word processor. The goal is to make -AbiWord full-featured, and remain lean. +AbiWord is a cross-platform Open Source word processor. It is full-featured, +while still remaining lean. + +%package devel +Summary: Support files necessary to compile applications based on libabiword +Group: Development/Libraries +Requires: abiword = %{epoch}:%{version}-%{release} + +%description devel +Libraries, headers, and support files necessary to compile applications +using libabiword. %prep -%setup -q -%patch0 -p1 -b .windowshelppaths +# setup abiword +%setup -q %patch1 -p1 -b .desktop -%patch2 -p1 -b .fontmanager -%patch3 -p1 -b .toc-layout %if 0%{?fedora} >= 9 -%patch4 -p0 -b .boolean +%patch2 -p1 -b .boolean %endif -%patch5 -p0 -b .goffice04 +%patch4 -p1 -b .libabiword +%patch8 -p1 -b .textbox + +# setup abiword-plugins +%setup -q -T -b 1 -n abiword-plugins-%{version} +%patch3 -p1 -b .boolean +%patch5 -p1 -b .xmpp +%patch6 -p1 -b .regression + +# setup abiword extras +%setup -q -T -b 2 -n abiword-extras-%{version} +%patch7 -p1 -b .destdir + +# setup abiword documentation +%setup -q -T -b 3 -n abiword-docs-%{version} +%patch0 -p1 -b .windowshelppaths + %build -cd abi -autoconf -%configure --enable-gnome --with-libxml2 -cd ../wv -%configure --with-libwmf --with-libxml2 -cd ../abi -make -cd ../abiword-plugins -libtoolize --copy --force -./nextgen.sh -%configure --disable-abicollab --disable-gda --disable-pdf --with-abiword=../abi +# build abiword +cd $RPM_BUILD_DIR/abiword-%{version} +%configure --enable-libabiword +make %{?_smp_mflags} + +# build abiword-plugins +cd $RPM_BUILD_DIR/abiword-plugins-%{version} +%configure --disable-gda --disable-gremlin --disable-abicapi --disable-presentation --with-abiword=../abiword-%{version} # Remove libtool predep_objects and postdep_objects wonkiness so that # building without -nostdlib doesn't include them twice. Because we # already link with g++, weird stuff happens if you don't let the @@ -75,33 +110,50 @@ libtoolize --copy --force sed 's/^predep_objects=.*/predep_objects=\"\"/' < libtool > libtool.foo sed 's/^postdep_objects=.*/postdep_objects=\"\"/' < libtool.foo > libtool.foobar sed 's/-shared -nostdlib/-shared/' < libtool.foobar > libtool +make %{?_smp_mflags} + +# build the extras +cd $RPM_BUILD_DIR/abiword-extras-%{version} +# abiword-extras looks at the abiword-%{version}.pc pkg-config file to get its location info +# however, that file is not installed yet, so just point to it in the abiword source tree +export PKG_CONFIG_PATH="../%{name}-%{version}" +# we need to re-autogen, as we have changed the destdir configuration +./autogen.sh make -# now make the docs -cd ../abiword-docs -ABI_DOC_PROG=$(pwd)/../abi/src/wp/main/unix/AbiWord-2.4 ./make-html.sh +# build the documentation +cd $RPM_BUILD_DIR/abiword-docs-%{version} +ABI_DOC_PROG=$(pwd)/../%{name}-%{version}/src/wp/main/unix/abiword ./make-html.sh %install -cd abi -# Remove .cvsignore files -find . -name '.cvsignore' -exec rm -f {} ';' +rm -rf $RPM_BUILD_ROOT + +# install abiword +cd $RPM_BUILD_DIR/abiword-%{version} make install DESTDIR=$RPM_BUILD_ROOT # Fix script permission -chmod +x $RPM_BUILD_ROOT%{_datadir}/AbiSuite-2.4/AbiWord/scripts/abw2html.pl -cd ../abiword-plugins +chmod +x $RPM_BUILD_ROOT%{_datadir}/%{name}-%{majorversion}.%{minorversion}/scripts/abw2html.pl + +# install abiword-plugins +cd $RPM_BUILD_DIR/abiword-plugins-%{version} make install DESTDIR=$RPM_BUILD_ROOT -# install the docs -cd ../abiword-docs -mkdir -p $RPM_BUILD_ROOT/%{_datadir}/AbiSuite-2.4/AbiWord/help -cp -rp help/* $RPM_BUILD_ROOT/%{_datadir}/AbiSuite-2.4/AbiWord/help/ +# install the extras +cd $RPM_BUILD_DIR/abiword-extras-%{version} +make install DESTDIR=$RPM_BUILD_ROOT + +# install the documentation +cd $RPM_BUILD_DIR/abiword-docs-%{version} +mkdir -p $RPM_BUILD_ROOT/%{_datadir}/%{name}-%{majorversion}.%{minorversion}/AbiWord/help +cp -rp help/* $RPM_BUILD_ROOT/%{_datadir}/%{name}-%{majorversion}.%{minorversion}/AbiWord/help/ # some of the help dirs have bad perms (#109261) -find $RPM_BUILD_ROOT/%{_datadir}/AbiSuite-2.4/AbiWord/help/ -type d -exec chmod -c o+rx {} \; +find $RPM_BUILD_ROOT/%{_datadir}/%{name}-%{majorversion}.%{minorversion}/AbiWord/help/ -type d -exec chmod -c o+rx {} \; +# finish up mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps/ -cp $RPM_BUILD_ROOT%{_datadir}/AbiSuite-2.4/icons/abiword_48.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/abiword_48.png +cp $RPM_BUILD_DIR/abiword-extras-%{version}/icons/abiword_48.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/abiword_48.png -cd ../abi +cd $RPM_BUILD_DIR/abiword-%{version} mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications desktop-file-install --vendor fedora --add-category X-Fedora \ --dir $RPM_BUILD_ROOT%{_datadir}/applications \ @@ -114,9 +166,8 @@ rm -f $RPM_BUILD_ROOT/%{_datadir}/applications/abiword.desktop mkdir -p $RPM_BUILD_ROOT%{_datadir}/mime-info install -m 644 %{SOURCE11} $RPM_BUILD_ROOT%{_datadir}/mime-info -rm -f $RPM_BUILD_ROOT%{_bindir}/ttf* # nuke .la files -rm -f $RPM_BUILD_ROOT/%{_libdir}/AbiWord-2.4/plugins/*.la +rm -f $RPM_BUILD_ROOT/%{_libdir}/%{name}-%{majorversion}.%{minorversion}/plugins/*.la %clean rm -rf $RPM_BUILD_ROOT @@ -129,17 +180,27 @@ update-desktop-database %{_datadir}/applications %files %defattr(-,root,root) -%doc abi/docs -%{_bindir}/AbiWord-2.4 +%doc $RPM_BUILD_DIR/%{name}-%{version}/docs $RPM_BUILD_DIR/%{name}-%{version}/COPYING $RPM_BUILD_DIR/%{name}-%{version}/COPYRIGHT.TXT $RPM_BUILD_DIR/%{name}-%{version}/README.TXT %{_bindir}/abiword -%{_libdir}/AbiWord-2.4 -%{_datadir}/AbiSuite-2.4 +%{_libdir}/%{name}-%{majorversion}.%{minorversion} +%{_datadir}/%{name}-%{majorversion}.%{minorversion} %{_datadir}/applications/* %{_datadir}/mime-info/* %{_datadir}/pixmaps/*png %{_datadir}/icons/*png +%files devel +%defattr(-,root,root) +%doc $RPM_BUILD_DIR/%{name}-%{version}/COPYING $RPM_BUILD_DIR/%{name}-%{version}/COPYRIGHT.TXT $RPM_BUILD_DIR/%{name}-%{version}/README.TXT +%{_includedir}/%{name}-%{majorversion}.%{minorversion} +%{_libdir}/libabiword-%{majorversion}.%{minorversion}.so* +%{_libdir}/pkgconfig/abiword-%{majorversion}.%{minorversion}.pc + %changelog +* Tue Mar 25 2008 Marc Maurer - 1:2.6.0-1 +- New upstream release +- Split off an experimental devel package + * Wed Feb 20 2008 Fedora Release Engineering - 1:2.4.6-8 - Autorebuild for GCC 4.3 diff --git a/sources b/sources index 4041499..86c0476 100644 --- a/sources +++ b/sources @@ -1 +1,4 @@ -8ed5fb282b9741aca75b9e47500d39a1 abiword-2.4.6.tar.bz2 +d627a5d1061160c683f2257da498355b abiword-2.6.0.tar.gz +ebdc165d1b6c3c69f11148cf7841f257 abiword-plugins-2.6.0.tar.gz +3daf3cbd59621fab0326512bf663d2d9 abiword-extras-2.6.0.tar.gz +7403e74ee977e16fcaa7bcb24be16d23 abiword-docs-2.6.0.tar.gz