From: Jan Rękorajski Date: Sat, 18 Oct 2014 19:20:42 +0000 (+0200) Subject: - updated to 3.0.0 X-Git-Tag: auto/th/abiword-3.0.0-1~2 X-Git-Url: http://git.pld-linux.org/gitweb.cgi?p=packages%2Fabiword.git;a=commitdiff_plain;h=4cf1515340528b06ca856c3fd9538360edda22c1 - updated to 3.0.0 --- diff --git a/abiword-desktop.patch b/abiword-desktop.patch index 8e6be9e..2b42753 100644 --- a/abiword-desktop.patch +++ b/abiword-desktop.patch @@ -1,10 +1,7 @@ --- abiword-2.8.6/abiword.desktop.orig 2010-04-02 21:48:05.000000000 +0200 +++ abiword-2.8.6/abiword.desktop 2011-08-09 12:46:04.744024498 +0200 -@@ -1,12 +1,12 @@ - [Desktop Entry] - Exec=abiword --Icon=abiword_48 -+Icon=abiword +@@ -1,10 +1,10 @@ + Icon=abiword Terminal=false Type=Application -Categories=Office;WordProcessor;GNOME;GTK;X-Red-Hat-Base; @@ -17,12 +14,11 @@ GenericName=Word Processor Comment=Compose, edit, and view documents @@ -28,7 +28,7 @@ - Name[fr]=Traitement de texte AbiWord - GenericName[fr]=Traitement de texte - Comment[fr]=Traitement de texte de Gnome Office --Name[pl]=Edytor tekstu AbiWord + Comment[nl]=AbiWord tekstverwerker + Comment[nn]=AbiWord Tekstbehandling + Comment[no]=AbiWord Tekstbehandler -Comment[pl]=Edytor tekstu AbiWord -+Name[pl]=Procesor tekstu AbiWord -+Comment[pl]=Procesor tekstu - Name[ja]=AbiWord ワードプロセッサ - Comment[ja]=AbiWord ワードプロセッサ ++Comment[pl]=Procesor tekstu AbiWord + Comment[pt]=AbiWord Processador de Texto + GenericName[ru]=Текстовый редактор + Comment[ru]=Обработка форматированных текстовых документов diff --git a/abiword-format-security.patch b/abiword-format-security.patch deleted file mode 100644 index 38b733f..0000000 --- a/abiword-format-security.patch +++ /dev/null @@ -1,264 +0,0 @@ ---- abiword-2.8.6/src/af/xap/gtk/xap_UnixDialogHelper.cpp~ 2010-02-06 20:34:36.000000000 +0100 -+++ abiword-2.8.6/src/af/xap/gtk/xap_UnixDialogHelper.cpp 2012-11-12 22:38:11.229320473 +0100 -@@ -830,7 +830,7 @@ - GTK_DIALOG_MODAL, - GTK_MESSAGE_INFO, - GTK_BUTTONS_OK, -- message ) ; -+ "%s", message ) ; - - gtk_window_set_title(GTK_WINDOW(msg), "AbiWord"); - gtk_window_set_role(GTK_WINDOW(msg), "message dialog"); ---- abiword-2.8.6/src/af/xap/gtk/xap_UnixDlg_Image.cpp~ 2009-06-07 03:36:47.000000000 +0200 -+++ abiword-2.8.6/src/af/xap/gtk/xap_UnixDlg_Image.cpp 2012-11-12 22:40:08.589316335 +0100 -@@ -488,7 +488,7 @@ - - std::string s; - pSS->getValueUTF8(XAP_STRING_ID_DLG_Image_Title,s); -- abiDialogSetTitle(mMainWindow, s.c_str()); -+ abiDialogSetTitle(mMainWindow, "%s", s.c_str()); - - localizeLabel(GTK_WIDGET(gtk_builder_get_object(builder, "lbDescTab")), pSS, XAP_STRING_ID_DLG_Image_DescTabLabel); - localizeLabel(GTK_WIDGET(gtk_builder_get_object(builder, "lbWrapTab")), pSS, XAP_STRING_ID_DLG_Image_WrapTabLabel); ---- abiword-2.8.6/src/af/xap/gtk/xap_UnixDlg_Zoom.cpp~ 2008-08-16 09:13:53.000000000 +0200 -+++ abiword-2.8.6/src/af/xap/gtk/xap_UnixDlg_Zoom.cpp 2012-11-12 22:41:17.615980564 +0100 -@@ -225,7 +225,7 @@ - // set the dialog title - UT_UTF8String s; - pSS->getValueUTF8(XAP_STRING_ID_DLG_Zoom_ZoomTitle,s); -- abiDialogSetTitle(window, s.utf8_str()); -+ abiDialogSetTitle(window, "%s", s.utf8_str()); - - // localize the strings in our dialog, and set tags for some widgets - ---- abiword-2.8.6/src/af/xap/xp/xap_Prefs.cpp~ 2010-02-06 21:50:16.000000000 +0100 -+++ abiword-2.8.6/src/af/xap/xp/xap_Prefs.cpp 2012-11-12 22:44:12.825974385 +0100 -@@ -1286,37 +1286,37 @@ - if (XAP_App::s_szBuild_ID && XAP_App::s_szBuild_ID[0]) - { - fprintf(fp,"\n"); - } - if (XAP_App::s_szBuild_Version && XAP_App::s_szBuild_Version[0]) - { - fprintf(fp,"\n"); - } - if (XAP_App::s_szBuild_Options && XAP_App::s_szBuild_Options[0]) - { - fprintf(fp,"\n"); - } - if (XAP_App::s_szBuild_Target && XAP_App::s_szBuild_Target[0]) - { - fprintf(fp,"\n"); - } - if (XAP_App::s_szBuild_CompileTime && XAP_App::s_szBuild_CompileTime[0]) - { - fprintf(fp,"\n"); - } - if (XAP_App::s_szBuild_CompileDate && XAP_App::s_szBuild_CompileDate[0]) - { - fprintf(fp,"\n"); - } - #endif ---- abiword-2.8.6/src/wp/ap/gtk/ap_UnixDialog_Annotation.cpp~ 2009-08-06 03:35:51.000000000 +0200 -+++ abiword-2.8.6/src/wp/ap/gtk/ap_UnixDialog_Annotation.cpp 2012-11-12 22:46:13.629303456 +0100 -@@ -165,7 +165,7 @@ - // set the dialog title - std::string s; - pSS->getValueUTF8(AP_STRING_ID_DLG_Annotation_Title,s); -- abiDialogSetTitle(window, s.c_str()); -+ abiDialogSetTitle(window, "%s", s.c_str()); - - // localize the strings in our dialog, and set some userdata for some widgets - localizeLabel(GTK_WIDGET(gtk_builder_get_object(builder, "lbTitle")), pSS, AP_STRING_ID_DLG_Annotation_Title_LBL); ---- abiword-2.8.6/src/wp/ap/gtk/ap_UnixDialog_Break.cpp~ 2009-06-03 09:31:03.000000000 +0200 -+++ abiword-2.8.6/src/wp/ap/gtk/ap_UnixDialog_Break.cpp 2012-11-12 22:46:33.815969411 +0100 -@@ -109,7 +109,7 @@ - // set the dialog title - UT_UTF8String s; - pSS->getValueUTF8(AP_STRING_ID_DLG_Break_BreakTitle_Capital,s); -- abiDialogSetTitle(window, s.utf8_str()); -+ abiDialogSetTitle(window, "%s", s.utf8_str()); - - // localize the strings in our dialog, and set tags for some widgets - ---- abiword-2.8.6/src/wp/ap/gtk/ap_UnixDialog_Field.cpp~ 2009-06-03 09:31:03.000000000 +0200 -+++ abiword-2.8.6/src/wp/ap/gtk/ap_UnixDialog_Field.cpp 2012-11-12 22:46:54.355968686 +0100 -@@ -297,7 +297,7 @@ - // set the dialog title - UT_UTF8String s; - pSS->getValueUTF8(AP_STRING_ID_DLG_Field_FieldTitle_Capital,s); -- abiDialogSetTitle(window, s.utf8_str()); -+ abiDialogSetTitle(window, "%s", s.utf8_str()); - - // localize the strings in our dialog, and set some userdata for some widg - ---- abiword-2.8.6/src/wp/ap/gtk/ap_UnixDialog_FormatFootnotes.cpp~ 2009-06-03 09:31:03.000000000 +0200 -+++ abiword-2.8.6/src/wp/ap/gtk/ap_UnixDialog_FormatFootnotes.cpp 2012-11-12 22:47:15.865967928 +0100 -@@ -372,7 +372,7 @@ - // set the dialog title - std::string s; - pSS->getValueUTF8(AP_STRING_ID_DLG_FormatFootnotes_Title,s); -- abiDialogSetTitle(window, s.c_str()); -+ abiDialogSetTitle(window, "%s", s.c_str()); - - // localize the strings in our dialog, and set tags for some widgets - ---- abiword-2.8.6/src/wp/ap/gtk/ap_UnixDialog_FormatFrame.cpp~ 2009-07-20 18:25:01.000000000 +0200 -+++ abiword-2.8.6/src/wp/ap/gtk/ap_UnixDialog_FormatFrame.cpp 2012-11-12 22:47:39.452633762 +0100 -@@ -476,7 +476,7 @@ - - // set the dialog title - ConstructWindowName(); -- abiDialogSetTitle(window, m_WindowName); -+ abiDialogSetTitle(window, "%s", m_WindowName); - - // disable double buffering on our preview - gtk_widget_set_double_buffered(m_wPreviewArea, FALSE); ---- abiword-2.8.6/src/wp/ap/gtk/ap_UnixDialog_FormatTable.cpp~ 2009-07-30 22:53:31.000000000 +0200 -+++ abiword-2.8.6/src/wp/ap/gtk/ap_UnixDialog_FormatTable.cpp 2012-11-12 22:48:01.205966328 +0100 -@@ -437,7 +437,7 @@ - - // set the dialog title - ConstructWindowName(); -- abiDialogSetTitle(window, m_WindowName); -+ abiDialogSetTitle(window, "%s", m_WindowName); - - // disable double buffering on our preview - gtk_widget_set_double_buffered(m_wPreviewArea, FALSE); ---- abiword-2.8.6/src/wp/ap/gtk/ap_UnixDialog_FormatTOC.cpp~ 2009-06-03 09:31:03.000000000 +0200 -+++ abiword-2.8.6/src/wp/ap/gtk/ap_UnixDialog_FormatTOC.cpp 2012-11-12 22:48:20.275965655 +0100 -@@ -361,7 +361,7 @@ - // set the dialog title - UT_UTF8String s; - pSS->getValueUTF8(AP_STRING_ID_DLG_FormatTOC_Title,s); -- abiDialogSetTitle(m_windowMain, s.utf8_str()); -+ abiDialogSetTitle(m_windowMain, "%s", s.utf8_str()); - - // localize notebook tabs - localizeLabel(_getWidget( "lbGeneral"), pSS, AP_STRING_ID_DLG_FormatTOC_General); ---- abiword-2.8.6/src/wp/ap/gtk/ap_UnixDialog_HdrFtr.cpp~ 2009-06-03 09:31:03.000000000 +0200 -+++ abiword-2.8.6/src/wp/ap/gtk/ap_UnixDialog_HdrFtr.cpp 2012-11-12 22:48:41.055964921 +0100 -@@ -203,7 +203,7 @@ - // set the dialog title - UT_UTF8String s; - pSS->getValueUTF8(AP_STRING_ID_DLG_HdrFtr_Title,s); -- abiDialogSetTitle(window, s.utf8_str()); -+ abiDialogSetTitle(window, "%s", s.utf8_str()); - - // localize the strings in our dialog - ---- abiword-2.8.6/src/wp/ap/gtk/ap_UnixDialog_Insert_DateTime.cpp~ 2009-06-03 09:31:03.000000000 +0200 -+++ abiword-2.8.6/src/wp/ap/gtk/ap_UnixDialog_Insert_DateTime.cpp 2012-11-12 22:49:15.639297036 +0100 -@@ -145,7 +145,7 @@ - // set the dialog title - UT_UTF8String s; - pSS->getValueUTF8(AP_STRING_ID_DLG_DateTime_DateTimeTitle,s); -- abiDialogSetTitle(window, s.utf8_str()); -+ abiDialogSetTitle(window, "%s", s.utf8_str()); - - // localize the strings in our dialog - ---- abiword-2.8.6/src/wp/ap/gtk/ap_UnixDialog_InsertTable.cpp~ 2009-06-03 04:38:41.000000000 +0200 -+++ abiword-2.8.6/src/wp/ap/gtk/ap_UnixDialog_InsertTable.cpp 2012-11-12 22:50:14.005961642 +0100 -@@ -127,7 +127,7 @@ - // set the dialog title - std::string s; - pSS->getValueUTF8(AP_STRING_ID_DLG_InsertTable_TableTitle,s); -- abiDialogSetTitle(window, s.c_str()); -+ abiDialogSetTitle(window, "%s", s.c_str()); - // Units - gtk_label_set_text (GTK_LABEL (GTK_WIDGET(gtk_builder_get_object(builder, "lbInch"))), UT_dimensionName(m_dim)); - double spinstep = getSpinIncr (); ---- abiword-2.8.6/src/wp/ap/gtk/ap_UnixDialog_MailMerge.cpp~ 2008-11-22 18:47:06.000000000 +0100 -+++ abiword-2.8.6/src/wp/ap/gtk/ap_UnixDialog_MailMerge.cpp 2012-11-12 22:50:32.412627659 +0100 -@@ -173,7 +173,7 @@ - // set the dialog title - UT_UTF8String s; - pSS->getValueUTF8(AP_STRING_ID_DLG_MailMerge_MailMergeTitle,s); -- abiDialogSetTitle(m_windowMain, s.utf8_str()); -+ abiDialogSetTitle(m_windowMain, "%s", s.utf8_str()); - - // localize the strings in our dialog, and set tags for some widgets - ---- abiword-2.8.6/src/wp/ap/gtk/ap_UnixDialog_MetaData.cpp~ 2008-08-16 09:13:53.000000000 +0200 -+++ abiword-2.8.6/src/wp/ap/gtk/ap_UnixDialog_MetaData.cpp 2012-11-12 22:51:13.505959544 +0100 -@@ -155,7 +155,7 @@ - // set the dialog title - UT_UTF8String s; - pSS->getValueUTF8(AP_STRING_ID_DLG_MetaData_Title,s); -- abiDialogSetTitle(window, s.utf8_str()); -+ abiDialogSetTitle(window, "%s", s.utf8_str()); - - // localize the strings in our dialog, and set some userdata for some widgets - localizeLabel(GTK_WIDGET(gtk_builder_get_object(builder, "lbTitle")), pSS, AP_STRING_ID_DLG_MetaData_Title_LBL); ---- abiword-2.8.6/src/wp/ap/gtk/ap_UnixDialog_Options.cpp~ 2009-07-03 19:17:25.000000000 +0200 -+++ abiword-2.8.6/src/wp/ap/gtk/ap_UnixDialog_Options.cpp 2012-11-12 22:51:45.839291734 +0100 -@@ -208,7 +208,7 @@ - - dlg = WID ( "ap_UnixDialog_Options_ColorSel" ); - pSS->getValueUTF8 ( AP_STRING_ID_DLG_Options_Label_ChooseForTransparent, s ); -- abiDialogSetTitle ( dlg, s.utf8_str() ); -+ abiDialogSetTitle ( dlg, "%s", s.utf8_str() ); - - colorsel = WID ( "csColorSel" ); - -@@ -529,7 +529,7 @@ - // set the dialog title - std::string s; - pSS->getValueUTF8(AP_STRING_ID_DLG_Options_OptionsTitle, s); -- abiDialogSetTitle(mainWindow, s.c_str()); -+ abiDialogSetTitle(mainWindow, "%s", s.c_str()); - - // the control buttons - g_signal_connect ( G_OBJECT ( m_buttonDefaults ), ---- abiword-2.8.6/src/wp/ap/gtk/ap_UnixDialog_PageNumbers.cpp~ 2009-06-03 09:31:03.000000000 +0200 -+++ abiword-2.8.6/src/wp/ap/gtk/ap_UnixDialog_PageNumbers.cpp 2012-11-12 22:52:01.915957837 +0100 -@@ -172,7 +172,7 @@ - // set the dialog title - UT_UTF8String s; - pSS->getValueUTF8(AP_STRING_ID_DLG_PageNumbers_Title,s); -- abiDialogSetTitle(window, s.utf8_str()); -+ abiDialogSetTitle(window, "%s", s.utf8_str()); - - // disable double buffering on our preview - gtk_widget_set_double_buffered(m_previewArea, FALSE); ---- abiword-2.8.6/src/wp/ap/gtk/ap_UnixDialog_Stylist.cpp~ 2009-06-01 07:25:31.000000000 +0200 -+++ abiword-2.8.6/src/wp/ap/gtk/ap_UnixDialog_Stylist.cpp 2012-11-12 22:52:25.832623658 +0100 -@@ -274,7 +274,7 @@ - // set the dialog title - UT_UTF8String s; - pSS->getValueUTF8(AP_STRING_ID_DLG_Stylist_Title,s); -- abiDialogSetTitle(m_windowMain, s.utf8_str()); -+ abiDialogSetTitle(m_windowMain, "%s", s.utf8_str()); - - g_object_unref(G_OBJECT(builder)); - ---- abiword-2.8.6/goffice-bits/goffice/gtk/goffice-gtk.c~ 2008-08-14 20:15:33.000000000 +0200 -+++ abiword-2.8.6/goffice-bits/goffice/gtk/goffice-gtk.c 2012-11-20 20:37:47.832386344 +0100 -@@ -853,7 +853,7 @@ - GTK_DIALOG_DESTROY_WITH_PARENT, - GTK_MESSAGE_WARNING, - GTK_BUTTONS_OK_CANCEL, -- msg); -+ "%s", msg); - gtk_dialog_set_default_response (GTK_DIALOG (dialog), - overwrite_by_default ? GTK_RESPONSE_OK : GTK_RESPONSE_CANCEL); - result = GTK_RESPONSE_OK == diff --git a/abiword-home_etc.patch b/abiword-home_etc.patch deleted file mode 100644 index ed0f1b6..0000000 --- a/abiword-home_etc.patch +++ /dev/null @@ -1,37 +0,0 @@ -diff -Nru abiword-2.0.1.orig/abi/src/af/xap/unix/xap_UnixApp.cpp abiword-2.0.1/abi/src/af/xap/unix/xap_UnixApp.cpp ---- abiword-2.0.1.orig/abi/src/af/xap/unix/xap_UnixApp.cpp 2003-06-07 18:28:14.000000000 +0200 -+++ abiword-2.0.1/abi/src/af/xap/unix/xap_UnixApp.cpp 2003-11-14 09:12:37.000000000 +0100 -@@ -176,7 +176,7 @@ - static char buf[PATH_MAX]; - memset(buf,0,sizeof(buf)); - -- char * szHome = getenv("HOME"); -+ char * szHome = getenv("HOME_ETC") ? getenv("HOME_ETC") : getenv("HOME"); - if (!szHome || !*szHome) - szHome = "./"; - -diff -Nru abiword-2.0.1.orig/abi/src/wp/ap/unix/ap_UnixApp.cpp abiword-2.0.1/abi/src/wp/ap/unix/ap_UnixApp.cpp ---- abiword-2.0.1.orig/abi/src/wp/ap/unix/ap_UnixApp.cpp 2003-10-10 15:35:35.000000000 +0200 -+++ abiword-2.0.1/abi/src/wp/ap/unix/ap_UnixApp.cpp 2003-11-14 09:14:05.000000000 +0100 -@@ -1099,7 +1099,7 @@ - static char buf[PATH_MAX]; - memset(buf,0,sizeof(buf)); - -- char * szHome = getenv("HOME"); -+ char * szHome = getenv("HOME_ETC") ? getenv("HOME_ETC") : getenv("HOME"); - if (!szHome || !*szHome) - szHome = "./"; - ---- abiword-2.0.1.orig/popt/poptconfig.c 2002-11-11 03:00:51.000000000 +0100 -+++ abiword-2.0.1/popt/poptconfig.c 2003-11-14 09:55:31.000000000 +0100 -@@ -144,7 +144,9 @@ - } - #endif - -- if ((home = getenv("HOME"))) { -+ home = getenv("HOME_ETC"); -+ if (!home) home = getenv("HOME"); -+ if (home) { - fn = alloca(strlen(home) + 20); - strcpy(fn, home); - strcat(fn, "/.popt"); diff --git a/abiword-libpng15.patch b/abiword-libpng15.patch deleted file mode 100644 index 836d074..0000000 --- a/abiword-libpng15.patch +++ /dev/null @@ -1,80 +0,0 @@ ---- abiword-2.8.6/src/af/util/xp/ut_png.cpp~ 2008-02-24 04:33:07.000000000 +0100 -+++ abiword-2.8.6/src/af/util/xp/ut_png.cpp 2012-02-09 01:24:18.808386895 +0100 -@@ -71,7 +71,7 @@ - * the normal method of doing things with libpng). REQUIRED unless you - * set up your own error handlers in the png_create_read_struct() earlier. - */ -- if (setjmp(png_ptr->jmpbuf)) -+ if (setjmp(png_jmpbuf(png_ptr))) - { - /* Free all of the memory associated with the png_ptr and info_ptr */ - png_destroy_read_struct(&png_ptr, &info_ptr, static_cast(NULL)); ---- abiword-2.8.6/src/wp/impexp/gtk/ie_impGraphic_GdkPixbuf.cpp~ 2009-07-01 06:02:04.000000000 +0200 -+++ abiword-2.8.6/src/wp/impexp/gtk/ie_impGraphic_GdkPixbuf.cpp 2012-02-09 01:30:28.706559268 +0100 -@@ -185,7 +185,7 @@ - /** needed for the stejmp context */ - UT_Error IE_ImpGraphic_GdkPixbuf::_png_write(GdkPixbuf * pixbuf) - { -- if (setjmp(m_pPNG->jmpbuf)) -+ if (setjmp(png_jmpbuf(m_pPNG))) - { - DELETEP(m_pPngBB); - png_destroy_write_struct(&m_pPNG, &m_pPNGInfo); -@@ -446,7 +446,7 @@ - * the normal method of doing things with libpng). REQUIRED unless you - * set up your own error handlers in the png_create_read_struct() earlier. - */ -- if (setjmp(m_pPNG->jmpbuf)) -+ if (setjmp(png_jmpbuf(m_pPNG))) - { - /* Free all of the memory associated with the png_ptr and info_ptr */ - png_destroy_write_struct(&m_pPNG, &m_pPNGInfo); ---- abiword-2.8.6/plugins/garble/xp/abiword-garble-png.cpp~ 2009-09-05 17:34:44.000000000 +0200 -+++ abiword-2.8.6/plugins/garble/xp/abiword-garble-png.cpp 2012-02-09 01:33:01.223765531 +0100 -@@ -79,7 +79,7 @@ - png_set_strip_alpha( png_ptr ); - png_set_interlace_handling( png_ptr ); - png_set_bgr( png_ptr ); -- rowbytes = info_ptr->rowbytes; -+ rowbytes = png_get_rowbytes(png_ptr, info_ptr); - png_destroy_read_struct( &png_ptr, &info_ptr, NULL ); - } - ---- abiword-2.8.6/plugins/bmp/xp/ie_impGraphic_BMP.cpp.orig 2012-02-09 01:34:30.630725875 +0100 -+++ abiword-2.8.6/plugins/bmp/xp/ie_impGraphic_BMP.cpp 2012-02-09 01:35:26.257576459 +0100 -@@ -191,7 +191,7 @@ - - /* Clean Up Memory Used */ - -- FREEP(m_pPNGInfo->palette); -+ FREEP(m_pPNGInfo); - DELETEP(pBB); - png_destroy_write_struct(&m_pPNG, &m_pPNGInfo); - -@@ -313,7 +313,7 @@ - * the normal method of doing things with libpng). REQUIRED unless you - * set up your own error handlers in the png_create_read_struct() earlier. - */ -- if (setjmp(m_pPNG->jmpbuf)) -+ if (setjmp(png_jmpbuf(m_pPNG))) - { - /* Free all of the memory associated with the png_ptr and info_ptr */ - png_destroy_write_struct(&m_pPNG, &m_pPNGInfo); -@@ -332,7 +332,7 @@ - UT_Error IE_ImpGraphic_BMP::Convert_BMP_Pallet(UT_ByteBuf* pBB) - { - /* Reset error handling for libpng */ -- if (setjmp(m_pPNG->jmpbuf)) -+ if (setjmp(png_jmpbuf(m_pPNG))) - { - png_destroy_write_struct(&m_pPNG, &m_pPNGInfo); - return UT_ERROR; -@@ -372,7 +372,7 @@ - UT_Error IE_ImpGraphic_BMP::Convert_BMP(UT_ByteBuf* pBB) - { - /* Reset error handling for libpng */ -- if (setjmp(m_pPNG->jmpbuf)) -+ if (setjmp(png_jmpbuf(m_pPNG))) - { - png_destroy_write_struct(&m_pPNG, &m_pPNGInfo); - return UT_ERROR; diff --git a/abiword-libwpd.patch b/abiword-libwpd.patch deleted file mode 100644 index c780e18..0000000 --- a/abiword-libwpd.patch +++ /dev/null @@ -1,417 +0,0 @@ -diff -urN abiword-2.8.2/plugin-configure.m4 abiword-2.8.2.new//plugin-configure.m4 ---- abiword-2.8.2/plugin-configure.m4 2010-02-12 15:12:07.000000000 +0100 -+++ abiword-2.8.2.new//plugin-configure.m4 2010-12-18 12:07:08.550263907 +0100 -@@ -1032,7 +1032,7 @@ - AC_SUBST([LOADBINDINGS_LIBS]) - - --wpg_pkgs="$gsf_req libwpg-0.1 >= 0.1.0 libwpd-0.8 >= 0.8.0" -+wpg_pkgs="$gsf_req libwpg-0.2 >= 0.2.0 libwpd-0.9 >= 0.9.0 libwpd-stream-0.9 >= 0.9.0" - wpg_deps="no" - - if test "$enable_wpg" != ""; then -@@ -1272,8 +1272,8 @@ - AC_SUBST([EML_LIBS]) - - --wordperfect_pkgs="libwpd-0.8 >= 0.8.0 $gsf_req" --wordperfect_wps_pkgs='libwps-0.1 >= 0.1.0' -+wordperfect_pkgs="libwpg-0.2 >= 0.2.0 libwpd-0.9 >= 0.9.0 libwpd-stream-0.9 >= 0.9.0 $gsf_req" -+wordperfect_wps_pkgs='libwps-0.2 >= 0.1.0' - wordperfect_deps="no" - - WORDPERFECT_CFLAGS= -diff -urN abiword-2.8.2/plugins/wordperfect/plugin.m4 abiword-2.8.2.new//plugins/wordperfect/plugin.m4 ---- abiword-2.8.2/plugins/wordperfect/plugin.m4 2009-06-22 06:33:05.000000000 +0200 -+++ abiword-2.8.2.new//plugins/wordperfect/plugin.m4 2010-12-18 12:02:29.184921950 +0100 -@@ -1,6 +1,6 @@ - --wordperfect_pkgs="libwpd-0.8 >= 0.8.0 $gsf_req" --wordperfect_wps_pkgs='libwps-0.1 >= 0.1.0' -+wordperfect_pkgs="libwpg-0.2 >= 0.2.0 libwpd-0.9 >= 0.9.0 libwpd-stream-0.9 >= 0.9.0 $gsf_req" -+wordperfect_wps_pkgs='libwps-0.2 >= 0.1.0' - wordperfect_deps="no" - - WORDPERFECT_CFLAGS= -diff -urN abiword-2.8.2/plugins/wordperfect/xp/ie_imp_WordPerfect.cpp abiword-2.8.2.new//plugins/wordperfect/xp/ie_imp_WordPerfect.cpp ---- abiword-2.8.2/plugins/wordperfect/xp/ie_imp_WordPerfect.cpp 2010-02-06 22:06:11.000000000 +0100 -+++ abiword-2.8.2.new//plugins/wordperfect/xp/ie_imp_WordPerfect.cpp 2010-12-18 12:02:29.181588156 +0100 -@@ -60,7 +60,7 @@ - - // Stream class - --#include -+#include - - #include - #include -@@ -70,12 +70,7 @@ - #include - #endif - --class AbiWordperfectInputStream : --#ifdef HAVE_LIBWPS -- public WPSInputStream --#else -- public WPXInputStream --#endif -+class AbiWordperfectInputStream : public WPXInputStream - { - public: - AbiWordperfectInputStream(GsfInput *input); -@@ -86,7 +81,7 @@ - - virtual WPXInputStream * getDocumentOLEStream(const char * name); - -- virtual const uint8_t *read(size_t numBytes, size_t &numBytesRead); -+ virtual const unsigned char *read(unsigned long numBytes, unsigned long &numBytesRead); - virtual int seek(long offset, WPX_SEEK_TYPE seekType); - virtual long tell(); - virtual bool atEOS(); -@@ -98,11 +93,7 @@ - }; - - AbiWordperfectInputStream::AbiWordperfectInputStream(GsfInput *input) : --#ifdef HAVE_LIBWPS -- WPSInputStream(), --#else -- WPXInputStream(true), --#endif -+ WPXInputStream(), - m_input(input), - m_ole(NULL) - { -@@ -117,9 +108,9 @@ - g_object_unref(G_OBJECT(m_input)); - } - --const uint8_t * AbiWordperfectInputStream::read(size_t numBytes, size_t &numBytesRead) -+const unsigned char * AbiWordperfectInputStream::read(unsigned long numBytes, unsigned long &numBytesRead) - { -- const uint8_t *buf = gsf_input_read(m_input, numBytes, NULL); -+ const unsigned char *buf = gsf_input_read(m_input, numBytes, NULL); - - if (buf == NULL) - numBytesRead = 0; -@@ -256,19 +247,12 @@ - { - AbiWordperfectInputStream gsfInput(input); - -- WPDConfidence confidence = WPDocument::isFileFormatSupported(&gsfInput, true); -+ WPDConfidence confidence = WPDocument::isFileFormatSupported(&gsfInput); - - switch (confidence) - { - case WPD_CONFIDENCE_NONE: -- // libwpd > 0.7.1 reports POOR if the text file is plain text (that _could_ be a WP4x document) -- // however, we'll let the text importer handle such cases -- case WPD_CONFIDENCE_POOR: - return UT_CONFIDENCE_ZILCH; -- case WPD_CONFIDENCE_LIKELY: -- return UT_CONFIDENCE_SOSO; -- case WPD_CONFIDENCE_GOOD: -- return UT_CONFIDENCE_GOOD; - case WPD_CONFIDENCE_EXCELLENT: - return UT_CONFIDENCE_PERFECT; - default: -@@ -328,7 +312,7 @@ - UT_Error IE_Imp_WordPerfect::_loadFile(GsfInput * input) - { - AbiWordperfectInputStream gsfInput(input); -- WPDResult error = WPDocument::parse(&gsfInput, static_cast(this)); -+ WPDResult error = WPDocument::parse(&gsfInput, static_cast(this), NULL); - - if (error != WPD_OK) - { -@@ -381,9 +365,9 @@ - float marginLeft = 1.0f, marginRight = 1.0f; - - if (propList["fo:margin-left"]) -- marginLeft = propList["fo:margin-left"]->getFloat(); -+ marginLeft = propList["fo:margin-left"]->getDouble(); - if (propList["fo:margin-right"]) -- marginRight = propList["fo:margin-right"]->getFloat(); -+ marginRight = propList["fo:margin-right"]->getDouble(); - - if (marginLeft != m_leftPageMargin || marginRight != m_rightPageMargin /* || */ - /* marginTop != m_marginBottom || marginBottom != m_marginBottom */ ) -@@ -456,15 +440,15 @@ - float marginTop = 0.0f, marginBottom = 0.0f; - float marginLeft = 0.0f, marginRight = 0.0f, textIndent = 0.0f; - if (propList["fo:margin-top"]) -- marginTop = propList["fo:margin-top"]->getFloat(); -+ marginTop = propList["fo:margin-top"]->getDouble(); - if (propList["fo:margin-bottom"]) -- marginBottom = propList["fo:margin-bottom"]->getFloat(); -+ marginBottom = propList["fo:margin-bottom"]->getDouble(); - if (propList["fo:margin-left"]) -- marginLeft = propList["fo:margin-left"]->getFloat(); -+ marginLeft = propList["fo:margin-left"]->getDouble(); - if (propList["fo:margin-right"]) -- marginRight = propList["fo:margin-right"]->getFloat(); -+ marginRight = propList["fo:margin-right"]->getDouble(); - if (propList["fo:text-indent"]) -- textIndent = propList["fo:text-indent"]->getFloat(); -+ textIndent = propList["fo:text-indent"]->getDouble(); - - m_topMargin = marginTop; - m_bottomMargin = marginBottom; -@@ -487,7 +471,7 @@ - - float lineSpacing = 1.0f; - if (propList["fo:line-height"]) -- lineSpacing = propList["fo:line-height"]->getFloat(); -+ lineSpacing = propList["fo:line-height"]->getDouble(); - - UT_String tmpBuffer; - UT_String_sprintf(tmpBuffer, "; margin-top:%.4fin; margin-bottom:%.4fin; margin-left:%.4fin; margin-right:%.4fin; text-indent:%.4fin; line-height:%.4f", -@@ -504,7 +488,7 @@ - propBuffer += tmpBuffer; - if (i()["style:position"]) - { -- UT_String_sprintf(tmpBuffer, "%.4fin", i()["style:position"]->getFloat()); -+ UT_String_sprintf(tmpBuffer, "%.4fin", i()["style:position"]->getDouble()); - propBuffer += tmpBuffer; - } - -@@ -520,10 +504,10 @@ - else // Left aligned is default - propBuffer += "/L"; - -- if (i()["style:leader-char"]) -- if (i()["style:leader-char"]->getStr() == "-") -+ if (i()["style:leader-text"]) -+ if (i()["style:leader-text"]->getStr() == "-") - propBuffer += "2"; -- else if (i()["style:leader-char"]->getStr() == "_") -+ else if (i()["style:leader-text"]->getStr() == "_") - propBuffer += "3"; - else // default to dot leader if the given leader is dot or is not supported by AbiWord - propBuffer += "1"; -@@ -586,12 +570,12 @@ - propBuffer += "subscript"; - } - -- if (propList["style:text-underline"] || propList["style:text-crossing-out"]) -+ if (propList["style:text-underline-type"] || propList["style:text-line-through-type"]) - { - propBuffer += "; text-decoration:"; -- if (propList["style:text-underline"]) -+ if (propList["style:text-underline-type"]) - propBuffer += "underline "; -- if (propList["style:text-crossing-out"]) -+ if (propList["style:text-line-through-type"]) - propBuffer += "line-through"; - - } -@@ -615,10 +599,10 @@ - propBuffer += propList["fo:color"]->getStr().cstr(); - } - -- if (propList["style:text-background-color"]) -+ if (propList["fo:background-color"]) - { - propBuffer += "; bgcolor:"; -- propBuffer += propList["style:text-background-color"]->getStr().cstr(); -+ propBuffer += propList["fo:background-color"]->getStr().cstr(); - } - - UT_DEBUGMSG(("AbiWordPerfect: Appending span format: %s\n", propBuffer.c_str())); -@@ -639,10 +623,10 @@ - int columnsCount = ((columns.count() == 0) ? 1 : columns.count()); - - // TODO: support spaceAfter -- if (propList["fo:margin-left"]) -- marginLeft = propList["fo:margin-left"]->getFloat(); -- if (propList["fo:margin-right"]) -- marginRight = propList["fo:margin-right"]->getFloat(); -+ if (propList["fo:start-indent"]) -+ marginLeft = propList["fo:start-indent"]->getDouble(); -+ if (propList["fo:end-indent"]) -+ marginRight = propList["fo:end-indent"]->getDouble(); - - if (marginLeft != m_leftSectionMargin || marginRight != m_rightSectionMargin || m_sectionColumnsCount != columnsCount) - m_bSectionChanged = true; -@@ -709,9 +693,9 @@ - if (propList["style:num-format"]) - listType = propList["style:num-format"]->getStr().cstr()[0]; - if (propList["text:space-before"]) -- listLeftOffset = propList["text:space-before"]->getFloat(); -+ listLeftOffset = propList["text:space-before"]->getDouble(); - if (propList["text:min-label-width"]) -- listMinLabelWidth = propList["text:min-label-width"]->getFloat(); -+ listMinLabelWidth = propList["text:min-label-width"]->getDouble(); - - if (!m_pCurrentListDefinition || - m_pCurrentListDefinition->getOutlineHash() != listID || -@@ -749,9 +733,9 @@ - if (propList["libwpd:level"]) - level = propList["libwpd:level"]->getInt(); - if (propList["text:space-before"]) -- listLeftOffset = propList["text:space-before"]->getFloat(); -+ listLeftOffset = propList["text:space-before"]->getDouble(); - if (propList["text:min-label-width"]) -- listMinLabelWidth = propList["text:min-label-width"]->getFloat(); -+ listMinLabelWidth = propList["text:min-label-width"]->getDouble(); - - if (!m_pCurrentListDefinition || m_pCurrentListDefinition->getOutlineHash() != listID) - { -@@ -871,10 +855,10 @@ - - UT_String_sprintf(tempBuffer, "margin-left:%.4fin; ", m_pCurrentListDefinition->getListLeftOffset(m_iCurrentListLevel) - + m_pCurrentListDefinition->getListMinLabelWidth(m_iCurrentListLevel) -- - (propList["fo:text-indent"] ? propList["fo:text-indent"]->getFloat() : 0.0f)); -+ - (propList["fo:text-indent"] ? propList["fo:text-indent"]->getDouble() : 0.0f)); - propBuffer += tempBuffer; - UT_String_sprintf(tempBuffer, "text-indent:%.4fin", - m_pCurrentListDefinition->getListMinLabelWidth(m_iCurrentListLevel) -- + (propList["fo:text-indent"] ? propList["fo:text-indent"]->getFloat() : 0.0f)); -+ + (propList["fo:text-indent"] ? propList["fo:text-indent"]->getDouble() : 0.0f)); - propBuffer += tempBuffer; - - listAttribs[attribsCount++] = PT_PROPS_ATTRIBUTE_NAME; -@@ -1263,7 +1247,7 @@ - virtual UT_Error _loadFile(GsfInput * input) - { - AbiWordperfectInputStream gsfInput(input); -- WPSResult error = WPSDocument::parse(&gsfInput, static_cast(this)); -+ WPSResult error = WPSDocument::parse(&gsfInput, static_cast(this)); - - if (error != WPS_OK) - { -@@ -1302,18 +1286,12 @@ - { - AbiWordperfectInputStream gsfInput(input); - -- WPSConfidence confidence = WPSDocument::isFileFormatSupported(&gsfInput, true); -+ WPSConfidence confidence = WPSDocument::isFileFormatSupported(&gsfInput); - - switch (confidence) - { - case WPS_CONFIDENCE_NONE: - return UT_CONFIDENCE_ZILCH; -- case WPS_CONFIDENCE_POOR: -- return UT_CONFIDENCE_POOR; -- case WPS_CONFIDENCE_LIKELY: -- return UT_CONFIDENCE_SOSO; -- case WPS_CONFIDENCE_GOOD: -- return UT_CONFIDENCE_GOOD; - case WPS_CONFIDENCE_EXCELLENT: - return UT_CONFIDENCE_PERFECT; - default: -diff -urN abiword-2.8.2/plugins/wordperfect/xp/ie_imp_WordPerfect.h abiword-2.8.2.new//plugins/wordperfect/xp/ie_imp_WordPerfect.h ---- abiword-2.8.2/plugins/wordperfect/xp/ie_imp_WordPerfect.h 2009-06-19 10:55:49.000000000 +0200 -+++ abiword-2.8.2.new//plugins/wordperfect/xp/ie_imp_WordPerfect.h 2010-12-18 12:02:29.184921950 +0100 -@@ -30,13 +30,7 @@ - #define IE_IMP_WP_H - - #include --#ifdef _WIN32 --#define POINT WPX_POINT --#endif - #include --#ifdef _WIN32 --#undef POINT --#endif - #include "ie_imp.h" - #include "ut_string.h" - #include "ut_string_class.h" -@@ -98,7 +92,7 @@ - IE_Imp ** ppie); - }; - --class IE_Imp_WordPerfect : public IE_Imp, public WPXHLListenerImpl -+class IE_Imp_WordPerfect : public IE_Imp, public WPXDocumentInterface - { - public: - IE_Imp_WordPerfect(PD_Document * pDocument); -@@ -154,6 +148,21 @@ - virtual void insertCoveredTableCell(const WPXPropertyList & /*propList*/) {} - virtual void closeTable(); - -+ virtual void definePageStyle(const WPXPropertyList&) {} -+ virtual void defineParagraphStyle(const WPXPropertyList&, const WPXPropertyListVector&) {} -+ virtual void defineCharacterStyle(const WPXPropertyList&) {} -+ virtual void defineSectionStyle(const WPXPropertyList&, const WPXPropertyListVector&) {} -+ virtual void insertSpace() {} -+ virtual void insertField(const WPXString&, const WPXPropertyList&) {} -+ virtual void openComment(const WPXPropertyList&) {} -+ virtual void closeComment() {} -+ virtual void openTextBox(const WPXPropertyList&) {} -+ virtual void closeTextBox() {} -+ virtual void openFrame(const WPXPropertyList&) {} -+ virtual void closeFrame() {} -+ virtual void insertBinaryObject(const WPXPropertyList&, const WPXBinaryData&) {} -+ virtual void insertEquation(const WPXPropertyList&, const WPXString&) {} -+ - - protected: - virtual UT_Error _loadFile(GsfInput * input); -diff -urN abiword-2.8.2/plugins/wpg/plugin.m4 abiword-2.8.2.new//plugins/wpg/plugin.m4 ---- abiword-2.8.2/plugins/wpg/plugin.m4 2008-05-19 16:06:19.000000000 +0200 -+++ abiword-2.8.2.new//plugins/wpg/plugin.m4 2010-12-18 12:02:29.188255745 +0100 -@@ -1,5 +1,5 @@ - --wpg_pkgs="$gsf_req libwpg-0.1 >= 0.1.0 libwpd-0.8 >= 0.8.0" -+wpg_pkgs="$gsf_req libwpg-0.2 >= 0.2.0 libwpd-0.9 >= 0.9.0 libwpd-stream-0.9 >= 0.9.0" - wpg_deps="no" - - if test "$enable_wpg" != ""; then -diff -urN abiword-2.8.2/plugins/wpg/xp/ie_impGraphic_WPG.cpp abiword-2.8.2.new//plugins/wpg/xp/ie_impGraphic_WPG.cpp ---- abiword-2.8.2/plugins/wpg/xp/ie_impGraphic_WPG.cpp 2008-08-15 23:52:32.000000000 +0200 -+++ abiword-2.8.2.new//plugins/wpg/xp/ie_impGraphic_WPG.cpp 2010-12-18 12:02:29.188255745 +0100 -@@ -31,11 +31,10 @@ - #include - #include - #include --#include -+#include - #include "xap_Module.h" - - using libwpg::WPGraphics; --using libwpg::WPGString; - - ABI_PLUGIN_DECLARE("WPG") - -@@ -48,7 +47,7 @@ - virtual bool isOLEStream(); - virtual WPXInputStream * getDocumentOLEStream(); - virtual WPXInputStream * getDocumentOLEStream(const char * name); -- virtual const uint8_t *read(size_t numBytes, size_t &numBytesRead); -+ virtual const unsigned char *read(unsigned long numBytes, unsigned long &numBytesRead); - virtual int seek(long offset, WPX_SEEK_TYPE seekType); - virtual long tell(); - virtual bool atEOS(); -@@ -60,7 +59,7 @@ - }; - - AbiWordPerfectGraphicsInputStream::AbiWordPerfectGraphicsInputStream(GsfInput *input) : -- WPXInputStream(true), -+ WPXInputStream(), - m_input(input), - m_ole(NULL) - { -@@ -75,9 +74,9 @@ - g_object_unref(G_OBJECT(m_input)); - } - --const uint8_t * AbiWordPerfectGraphicsInputStream::read(size_t numBytes, size_t &numBytesRead) -+const unsigned char * AbiWordPerfectGraphicsInputStream::read(unsigned long numBytes, unsigned long &numBytesRead) - { -- const uint8_t *buf = gsf_input_read(m_input, numBytes, NULL); -+ const unsigned char *buf = gsf_input_read(m_input, numBytes, NULL); - - if (buf == NULL) - numBytesRead = 0; -@@ -245,10 +244,10 @@ - UT_Error IE_Imp_WordPerfectGraphics::importGraphic(GsfInput *input, FG_Graphic **ppfg) - { - AbiWordPerfectGraphicsInputStream gsfInput(input); -- WPGString svgOutput; -+ WPXString svgOutput; - if (WPGraphics::generateSVG(&gsfInput, svgOutput)) - { -- GsfInput * svgInput = gsf_input_memory_new((const guint8*)svgOutput.cstr(), svgOutput.length(), false); -+ GsfInput * svgInput = gsf_input_memory_new((const guint8*)svgOutput.cstr(), svgOutput.len(), false); - UT_Error result = IE_ImpGraphic::loadGraphic(svgInput, IE_ImpGraphic::fileTypeForSuffix(".svg"), ppfg); - g_object_unref(svgInput); - return result; diff --git a/abiword-link.patch b/abiword-link.patch deleted file mode 100644 index c2b35cd..0000000 --- a/abiword-link.patch +++ /dev/null @@ -1,29 +0,0 @@ ---- abiword-2.8.6/src/Makefile.am~ 2009-09-09 15:11:01.000000000 +0200 -+++ abiword-2.8.6/src/Makefile.am 2011-09-12 07:03:10.105448720 +0200 -@@ -44,7 +44,7 @@ - - libabiword_2_8_la_LDFLAGS = \ - $(DEPS_LIBS) \ -- --no-undefined \ -+ -Wl,--no-undefined \ - -avoid-version \ - -export-dynamic - -@@ -107,7 +107,7 @@ - - AbiWord_LDFLAGS = \ - $(DEPS_LIBS) \ -- --no-undefined \ -+ -Wl,--no-undefined \ - -avoid-version \ - -export-dynamic \ - -headerpad_max_install_names -@@ -129,7 +129,7 @@ - - abiword_LDFLAGS = \ - $(platform_ldflags) \ -- --no-undefined \ -+ -Wl,--no-undefined \ - -avoid-version \ - -export-dynamic - diff --git a/abiword.spec b/abiword.spec index 9c0709d..e560ffa 100644 --- a/abiword.spec +++ b/abiword.spec @@ -1,7 +1,8 @@ # # TODO: # - installed, but unpackaged files -# /usr/share/mime-info/abiword.keys +# %{_datadir}/dbus-1/services/org.freedesktop.Telepathy.Client.AbiCollab.service +# %{_datadir}/telepathy/clients/AbiCollab.client # %bcond_with gda # libgda support %bcond_with goffice # without plugin-goffice @@ -9,25 +10,20 @@ %bcond_with gnomevfs # gnome-vfs support %bcond_with ots # try build plugin-ots (requires ots >= 0.5.0) # -%define mver 2.8 +%define mver 3.0 # Summary: Multi-platform word processor Summary(pl.UTF-8): Wieloplatformowy procesor tekstu Name: abiword -Version: 2.8.6 -Release: 18 +Version: 3.0.0 +Release: 1 Epoch: 1 License: GPL v2+ Group: X11/Applications/Editors Source0: http://www.abisource.com/downloads/abiword/%{version}/source/%{name}-%{version}.tar.gz -# Source0-md5: f883b0a7f26229a9c66fd6a1a94381aa +# Source0-md5: 8d9c41cff3a8fbef8d0c835c65600e65 Patch0: %{name}-desktop.patch Patch1: %{name}-mht.patch -Patch2: %{name}-libwpd.patch -Patch3: %{name}-link.patch -Patch4: %{name}-libpng15.patch -Patch5: glib.patch -Patch6: %{name}-format-security.patch URL: http://www.abisource.com/ BuildRequires: aiksaurus-gtk-devel >= 1.2.1 BuildRequires: autoconf @@ -321,16 +317,6 @@ Jest to teczka clipartów używanych przez AbiWorda. %setup -q %patch0 -p1 %patch1 -p1 -%patch2 -p1 -%patch3 -p1 -%patch4 -p1 -%patch5 -p1 -%patch6 -p1 - -# use generic icon name -%{__sed} -i -e 's|abiword_48.png|abiword.png|' Makefile.am -%{__sed} -i -e 's|abiword_48|abiword|' src/wp/ap/gtk/ap_UnixFrameImpl.cpp -mv abiword_48.png abiword.png %build %{__aclocal} -I . @@ -386,9 +372,13 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/abiword-%{mver}/templates %{_datadir}/abiword-%{mver}/ui %{_datadir}/abiword-%{mver}/xsltml +%{_datadir}/abiword-%{mver}/mime-info +%{_datadir}/abiword-%{mver}/omml_xslt %{_desktopdir}/*.desktop %{_pixmapsdir}/*.png %{_mandir}/man1/abiword.1* +#%{_datadir}/dbus-1/services/org.freedesktop.Telepathy.Client.AbiCollab.service +#%{_datadir}/telepathy/clients/AbiCollab.client # These don't add any additional dependencies so there's no reason to split %attr(755,root,root) %{_libdir}/abiword-%{mver}/plugins/applix.so @@ -397,6 +387,7 @@ rm -rf $RPM_BUILD_ROOT %attr(755,root,root) %{_libdir}/abiword-%{mver}/plugins/clarisworks.so %attr(755,root,root) %{_libdir}/abiword-%{mver}/plugins/docbook.so %attr(755,root,root) %{_libdir}/abiword-%{mver}/plugins/eml.so +%attr(755,root,root) %{_libdir}/abiword-%{mver}/plugins/epub.so %attr(755,root,root) %{_libdir}/abiword-%{mver}/plugins/freetranslation.so %attr(755,root,root) %{_libdir}/abiword-%{mver}/plugins/garble.so %attr(755,root,root) %{_libdir}/abiword-%{mver}/plugins/gdict.so @@ -425,7 +416,7 @@ rm -rf $RPM_BUILD_ROOT %attr(755,root,root) %{_libdir}/abiword-%{mver}/plugins/urldict.so %attr(755,root,root) %{_libdir}/abiword-%{mver}/plugins/wikipedia.so %attr(755,root,root) %{_libdir}/abiword-%{mver}/plugins/wml.so -%attr(755,root,root) %{_libdir}/abiword-%{mver}/plugins/wpg.so +#%attr(755,root,root) %{_libdir}/abiword-%{mver}/plugins/wpg.so %attr(755,root,root) %{_libdir}/abiword-%{mver}/plugins/xslfo.so %files devel @@ -484,9 +475,9 @@ rm -rf $RPM_BUILD_ROOT %defattr(644,root,root,755) %attr(755,root,root) %{_libdir}/abiword-%{mver}/plugins/wmf.so -%files plugin-wordperfect -%defattr(644,root,root,755) -%attr(755,root,root) %{_libdir}/abiword-%{mver}/plugins/wordperfect.so +#%files plugin-wordperfect +#%defattr(644,root,root,755) +#%attr(755,root,root) %{_libdir}/abiword-%{mver}/plugins/wordperfect.so %files clipart %defattr(644,root,root,755) diff --git a/glib.patch b/glib.patch deleted file mode 100644 index f8255e0..0000000 --- a/glib.patch +++ /dev/null @@ -1,35 +0,0 @@ -diff -up abiword-2.8.6/goffice-bits/goffice/app/go-cmd-context.c.glibfix abiword-2.8.6/goffice-bits/goffice/app/go-cmd-context.c ---- abiword-2.8.6/goffice-bits/goffice/app/go-cmd-context.c.glibfix 2012-02-27 15:04:45.744812212 -0500 -+++ abiword-2.8.6/goffice-bits/goffice/app/go-cmd-context.c 2012-02-27 15:05:51.628239624 -0500 -@@ -10,7 +10,7 @@ - #include "go-cmd-context-impl.h" - #include - #include --#include -+#include - - #define GCC_CLASS(o) (G_TYPE_INSTANCE_GET_INTERFACE ((o), GO_CMD_CONTEXT_TYPE, GOCmdContextClass)) - -diff -up abiword-2.8.6/goffice-bits/goffice/app/goffice-app.h.glibfix abiword-2.8.6/goffice-bits/goffice/app/goffice-app.h ---- abiword-2.8.6/goffice-bits/goffice/app/goffice-app.h.glibfix 2012-02-27 15:06:06.157113352 -0500 -+++ abiword-2.8.6/goffice-bits/goffice/app/goffice-app.h 2012-02-27 15:06:11.037070941 -0500 -@@ -22,7 +22,7 @@ - #ifndef GOFFICE_APP_H - #define GOFFICE_APP_H - --#include -+#include - - G_BEGIN_DECLS - -diff -up abiword-2.8.6/src/af/util/xp/ut_go_file.h.glibfix abiword-2.8.6/src/af/util/xp/ut_go_file.h ---- abiword-2.8.6/src/af/util/xp/ut_go_file.h.glibfix 2012-02-27 15:07:23.222443598 -0500 -+++ abiword-2.8.6/src/af/util/xp/ut_go_file.h 2012-02-27 15:07:26.708413289 -0500 -@@ -31,7 +31,6 @@ - - #include - #include --#include - #include - - G_BEGIN_DECLS diff --git a/libpngX.patch b/libpngX.patch deleted file mode 100644 index c4799fb..0000000 --- a/libpngX.patch +++ /dev/null @@ -1,33 +0,0 @@ ---- abiword-2.8.1/plugins/garble/Makefile.am.orig 2009-10-20 17:07:49.000000000 +0200 -+++ abiword-2.8.1/plugins/garble/Makefile.am 2010-02-05 17:05:16.644285818 +0100 -@@ -8,7 +8,7 @@ plugin_LTLIBRARIES = garble.la - - garble_la_LIBADD = \ - xp/libxp.la \ -- $(GARBLE_LIBS) -lpng12 -ljpeg -+ $(GARBLE_LIBS) -lpng -ljpeg - - garble_la_LDFLAGS = \ - $(GARBLE_LIBS) \ ---- abiword-2.8.1/plugins/rsvg/Makefile.am.orig 2009-10-20 17:07:49.000000000 +0200 -+++ abiword-2.8.1/plugins/rsvg/Makefile.am 2010-02-05 17:05:16.870953670 +0100 -@@ -6,7 +6,7 @@ plugin_LTLIBRARIES = rsvg.la - - rsvg_la_LIBADD = \ - xp/libxp.la \ -- $(RSVG_LIBS) -lpng12 -+ $(RSVG_LIBS) -lpng - - rsvg_la_LDFLAGS = \ - -avoid-version \ ---- abiword-2.8.1/plugin-configure.m4.orig 2010-02-05 17:05:54.863451295 +0100 -+++ abiword-2.8.1/plugin-configure.m4 2010-02-05 17:06:05.057616795 +0100 -@@ -1553,7 +1553,7 @@ if test "$enable_bmp" == "yes" || \ - # TODO check for libpng, well abiword links to it anyways - - BMP_CFLAGS="$BMP_CFLAGS "'${PLUGIN_CFLAGS}' --BMP_LIBS="$BMP_LIBS "'${PLUGIN_LIBS} -lpng12' -+BMP_LIBS="$BMP_LIBS "'${PLUGIN_LIBS} -lpng' - - if test "$enable_bmp_builtin" == "yes"; then - BMP_CFLAGS="$BMP_CFLAGS -DABI_PLUGIN_BUILTIN"