milislinux
/
milis
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

abiword

This commit is contained in:
milisbir 2018-07-19 21:02:12 +03:00
parent 399cd47bc4
commit ef5cae533b
11 changed files with 1508 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1186
talimatname/genel/a/abiword/abiword-3.0.0-librevenge.patch Normal file
View File

File diff suppressed because it is too large Load Diff

41
talimatname/genel/a/abiword/abiword-3.0.1-libwps-0.4.patch Normal file
View File

@ -0,0 +1,41 @@
From 6fcb43935bab90d61858eb1bc0f150c843586c54 Mon Sep 17 00:00:00 2001
From: David Tardon <dtardon@redhat.com>
Date: Sat, 6 Jun 2015 21:48:02 +0200
Subject: [PATCH] adapt to libwps 0.4
---
plugin-configure.m4 | 2 +-
plugins/wordperfect/plugin.m4 | 2 +-
plugins/wordperfect/xp/ie_imp_WordPerfect.cpp | 4 +++-
3 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/plugins/wordperfect/plugin.m4 b/plugins/wordperfect/plugin.m4
index 0aadbaf..bc32d48 100644
--- a/plugins/wordperfect/plugin.m4
+++ b/plugins/wordperfect/plugin.m4
@@ -1,6 +1,6 @@
wordperfect_pkgs="libwpd-0.10 $gsf_req"
-wordperfect_wps_pkgs='libwps-0.3'
+wordperfect_wps_pkgs='libwps-0.4'
wordperfect_deps="no"
WORDPERFECT_CFLAGS=
diff --git a/plugins/wordperfect/xp/ie_imp_WordPerfect.cpp b/plugins/wordperfect/xp/ie_imp_WordPerfect.cpp
index bd19971..3e69f79 100644
--- a/plugins/wordperfect/xp/ie_imp_WordPerfect.cpp
+++ b/plugins/wordperfect/xp/ie_imp_WordPerfect.cpp
@@ -1389,7 +1389,9 @@ UT_Confidence_t IE_Imp_MSWorks_Sniffer::recognizeContents (GsfInput * input)
AbiWordperfectInputStream gsfInput(input);
libwps::WPSKind kind;
- libwps::WPSConfidence confidence = libwps::WPSDocument::isFileFormatSupported(&gsfInput, kind);
+ libwps::WPSCreator creator;
+ bool needsEncoding = false;
+ libwps::WPSConfidence confidence = libwps::WPSDocument::isFileFormatSupported(&gsfInput, kind, creator, needsEncoding);
if (kind != libwps::WPS_TEXT)
confidence = libwps::WPS_CONFIDENCE_NONE;
--
2.4.2

2
talimatname/genel/a/abiword/abiword.kur-kos
View File

@ -1 +1 @@
/usr/bin/update-desktop-database update-desktop-database

17
talimatname/genel/a/abiword/abiword.okubeni
View File

@ -1,17 +0,0 @@
1. Fichier de configuration:
~/.AbiSuite/templates/normal.awt
2. Choix du bon modèle:
Choisissez le bon modèle adapté à votre langue et votre locale dans la liste qu'affiche la commande suivante:
ls /usr/share/abiword-2.9/templates
Créez le dossier ~/.AbiSuite/templates et copiez-y le normal.awt que vous souhaitez:
install -v -m750 -d ~/.AbiSuite/templates &&
install -v -m640 /usr/share/abiword-2.9/templates/normal.awt-<votrelangue> ~/.AbiSuite/templates/normal.awt
Il est recommandé d'utiliser une police de caractères qui couvre une plus grande couverture comme dejavu-fonts.

46
talimatname/genel/a/abiword/aiksaurus-plugin.m4 Normal file
View File

@ -0,0 +1,46 @@
aiksaurus_pkgs="aiksaurus-1.0"
aiksaurus_gtk_pkgs="aiksaurusgtk3-1.0"
aiksaurus_deps="no"
if test "$enable_aiksaurus" != ""; then
PKG_CHECK_EXISTS([ $aiksaurus_pkgs ],
[
aiksaurus_deps="yes"
], [
test "$enable_aiksaurus" = "auto" && AC_MSG_WARN([aiksaurus plugin: dependencies not satisfied - $aiksaurus_pkgs])
])
fi
if test "$enable_aiksaurus" = "yes" || \
test "$aiksaurus_deps" = "yes"; then
use_builtin_aiksaurus_gtk="no"
if test "$TOOLKIT" = "gtk"; then
PKG_CHECK_EXISTS([ $aiksaurus_gtk_pkgs ],
[
aiksaurus_pkgs="$aiksaurus_pkgs $aiksaurus_gtk_pkgs"
], [use_builtin_aiksaurus_gtk="yes"])
fi
if test "$enable_aiksaurus_builtin" = "yes"; then
AC_MSG_ERROR([aiksaurus plugin: static linking not supported])
fi
PKG_CHECK_MODULES(AIKSAURUS,[ $aiksaurus_pkgs ])
test "$enable_aiksaurus" = "auto" && PLUGINS="$PLUGINS aiksaurus"
AIKSAURUS_CFLAGS="$AIKSAURUS_CFLAGS "'${PLUGIN_CFLAGS}'
AIKSAURUS_LIBS="$AIKSAURUS_LIBS "'${PLUGIN_LIBS}'
fi
AM_CONDITIONAL([WITH_BUILTIN_AIKSAURUS_GTK],[ test "x$use_builtin_aiksaurus_gtk" = "xyes" ])
AC_SUBST([AIKSAURUS_CFLAGS])
AC_SUBST([AIKSAURUS_LIBS])

49
talimatname/genel/a/abiword/bug13815.patch Normal file
View File

@ -0,0 +1,49 @@
commit 2ee38d1881aeea27bb49acc450631d813d1f28ba
Author: Hubert Figuière <hub@figuiere.net>
Date: Wed Dec 7 09:44:01 2016 -0500
Bug 13815 - draw event should return TRUE
This fix the black drawing regression witj Gtk3.22
diff --git a/src/af/xap/gtk/xap_UnixFrameImpl.cpp b/src/af/xap/gtk/xap_UnixFrameImpl.cpp
index 780000e..10f8e00 100644
--- a/src/af/xap/gtk/xap_UnixFrameImpl.cpp
+++ b/src/af/xap/gtk/xap_UnixFrameImpl.cpp
@@ -1208,9 +1208,9 @@ gint XAP_UnixFrameImpl::_fe::delete_event(GtkWidget * w, GdkEvent * /*event*/, g
}
#if GTK_CHECK_VERSION(3,0,0)
-gint XAP_UnixFrameImpl::_fe::draw(GtkWidget * w, cairo_t * cr)
+gboolean XAP_UnixFrameImpl::_fe::draw(GtkWidget * w, cairo_t * cr)
#else
-gint XAP_UnixFrameImpl::_fe::expose(GtkWidget * w, GdkEventExpose* pExposeEvent)
+gboolean XAP_UnixFrameImpl::_fe::expose(GtkWidget * w, GdkEventExpose* pExposeEvent)
#endif
{
XAP_UnixFrameImpl * pUnixFrameImpl = static_cast<XAP_UnixFrameImpl *>(g_object_get_data(G_OBJECT(w), "user_data"));
@@ -1243,7 +1243,7 @@ gint XAP_UnixFrameImpl::_fe::expose(GtkWidget * w, GdkEventExpose* pExposeEvent)
pView->draw(&rClip);
#endif
}
- return FALSE;
+ return TRUE;
}
static bool bScrollWait = false;
diff --git a/src/af/xap/gtk/xap_UnixFrameImpl.h b/src/af/xap/gtk/xap_UnixFrameImpl.h
index 30ee5d8..a0ff57f 100644
--- a/src/af/xap/gtk/xap_UnixFrameImpl.h
+++ b/src/af/xap/gtk/xap_UnixFrameImpl.h
@@ -152,9 +152,9 @@ protected:
static gint key_release_event(GtkWidget* w, GdkEventKey* e);
static gint delete_event(GtkWidget * w, GdkEvent * /*event*/, gpointer /*data*/);
#if GTK_CHECK_VERSION(3,0,0)
- static gint draw(GtkWidget * w, cairo_t * cr);
+ static gboolean draw(GtkWidget * w, cairo_t * cr);
#else
- static gint expose(GtkWidget * w, GdkEventExpose* pExposeEvent);
+ static gboolean expose(GtkWidget * w, GdkEventExpose* pExposeEvent);
#endif
static gint do_ZoomUpdate( gpointer /* xap_UnixFrame * */ p);
static void vScrollChanged(GtkAdjustment * w, gpointer /*data*/);

47
talimatname/genel/a/abiword/command-plugin.m4 Normal file
View File

@ -0,0 +1,47 @@
command_deps="no"
if test "$enable_command" != ""; then
if test "$TOOLKIT" != "gtk"; then
command_deps="no"
AC_MSG_WARN([command plugin: only supported on UNIX/gtk platforms])
else
# stolen from the original plugin.m4 in abiword-plugins
AC_CHECK_HEADER(readline/readline.h,[
AC_CHECK_HEADER(readline/history.h,[
AC_CHECK_LIB(readline,readline,[
command_deps="yes"
],[ AC_CHECK_LIB(readline,rl_initialize,[
command_deps="yes"
],,)
],)
])
])
fi
fi
if test "$enable_command" = "yes" || \
test "$command_deps" = "yes"; then
if test "$enable_command_builtin" = "yes"; then
AC_MSG_ERROR([command plugin: static linking not supported])
fi
AC_MSG_CHECKING([command plugin: for readline and friends])
if test "$command_deps" != "yes"; then
AC_MSG_ERROR([no])
else
AC_MSG_RESULT([yes])
COMMAND_LIBS="-lreadline -lhistory $COMMAND_LIBS"
fi
test "$enable_command" = "auto" && PLUGINS="$PLUGINS command"
COMMAND_CFLAGS="$COMMAND_CFLAGS "'${PLUGIN_CFLAGS}'
COMMAND_LIBS="$COMMAND_LIBS "'${PLUGIN_LIBS}'
fi
AC_SUBST([COMMAND_CFLAGS])
AC_SUBST([COMMAND_LIBS])

29
talimatname/genel/a/abiword/enchant-2.1.patch Normal file
View File

@ -0,0 +1,29 @@
--- abiword-3.0.2/src/af/xap/xp/enchant_checker.cpp.orig 2013-04-07 13:53:03.000000000 +0000
+++ abiword-3.0.2/src/af/xap/xp/enchant_checker.cpp 2017-11-19 22:54:41.236180298 +0000
@@ -127,7 +127,7 @@
pvSugg->addItem (ucszSugg);
}
- enchant_dict_free_suggestions (m_dict, suggestions);
+ enchant_dict_free_string_list (m_dict, suggestions);
}
return pvSugg;
@@ -139,7 +139,7 @@
if (word && len) {
UT_UTF8String utf8 (word, len);
- enchant_dict_add_to_personal (m_dict, utf8.utf8_str(), utf8.byteLength());
+ enchant_dict_add (m_dict, utf8.utf8_str(), utf8.byteLength());
return true;
}
return false;
@@ -150,7 +150,7 @@
UT_return_val_if_fail (m_dict, false);
UT_UTF8String ignore (toCorrect, toCorrectLen);
- return enchant_dict_is_in_session (m_dict, ignore.utf8_str(), ignore.byteLength()) != 0;
+ return enchant_dict_is_added (m_dict, ignore.utf8_str(), ignore.byteLength()) != 0;
}
void EnchantChecker::ignoreWord (const UT_UCSChar *toCorrect, size_t toCorrectLen)

13
talimatname/genel/a/abiword/libical-deprecated.patch Normal file
View File

@ -0,0 +1,13 @@
--- abiword-3.0.2/src/text/ptbl/xp/pd_DocumentRDF.cpp.orig 2015-04-02 03:09:20.000000000 +0000
+++ abiword-3.0.2/src/text/ptbl/xp/pd_DocumentRDF.cpp 2017-11-19 22:57:49.533304878 +0000
@@ -2269,8 +2269,8 @@
icalcomponent_set_uid( c, m_uid.c_str() );
icalcomponent_set_location( c, m_location.c_str() );
icalcomponent_set_description( c, m_desc.c_str() );
- icalcomponent_set_dtstart( c, icaltime_from_timet( m_dtstart, 0 ) );
- icalcomponent_set_dtend( c, icaltime_from_timet( m_dtend, 0 ) );
+ icalcomponent_set_dtstart( c, icaltime_from_timet_with_zone( m_dtstart, 0, 0 ) );
+ icalcomponent_set_dtend( c, icaltime_from_timet_with_zone( m_dtend, 0, 0 ) );
char* data = icalcomponent_as_ical_string( c );
std::ofstream oss( filename.c_str() );

31
talimatname/genel/a/abiword/python-override.patch Normal file
View File

@ -0,0 +1,31 @@
From 51787d61993cb3981c18e4cf174fc229734fba1e Mon Sep 17 00:00:00 2001
From: Jean Brefort <jean.brefort@normalesup.org>
Date: Sun, 6 Dec 2015 11:04:10 +0000
Subject: [PATCH] Update python override code. Fixes #13745 and #13746, thanks
to David Gutteridge.
git-svn-id: svn+ssh://svn.abisource.com/svnroot/abiword/trunk@35171 bcba8976-2d24-0410-9c9c-aab3bd5fdfd6
---
src/gi-overrides/Abi.py | 2 ++
src/gi-overrides/Makefile.am | 2 +-
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/src/gi-overrides/Abi.py b/src/gi-overrides/Abi.py
index 666fd61..e3b61b9 100644
--- a/src/gi-overrides/Abi.py
+++ b/src/gi-overrides/Abi.py
@@ -1,4 +1,6 @@
import sys
+import gi
+gi.require_version('Gtk', '3.0')
from gi.repository import Gtk
from ..overrides import override
from ..importer import modules
diff --git a/src/gi-overrides/Makefile.am b/src/gi-overrides/Makefile.am
index 7fe3913..60f306d 100644
--- a/src/gi-overrides/Makefile.am
+++ b/src/gi-overrides/Makefile.am
@@ -1,2 +1,2 @@
-overridesdir = `python -c "import gi; print gi._overridesdir"`
+overridesdir = `python -c "import gi; print(gi._overridesdir)"`
overrides_PYTHON = Abi.py

79
talimatname/genel/a/abiword/talimat
View File

@ -1,23 +1,74 @@
# Tanım: Microsoft® Word benzeri basit bir kelime işlemci yazılımı. # Tanım: Microsoft Word benzeri basit bir kelime işlemci yazılımı.
# URL: http://www.abisource.com/ # URL: http://www.abisource.com/
# Paketçi: milisarge # Paketçi: milisarge
# Gerekler: boost cairo aspell fribidi enchant wv librsvg gtk2 redland rasqal desktop-file-utils gtk3 # Gerekler: boost cairo aspell fribidi enchant wv icu librsvg gtk2 redland rasqal desktop-file-utils gtk3 goffice
# Grup: ofis # Grup: ofis
isim=abiword isim=abiword
surum=3.0.1 surum=3.0.2
devir=3 devir=1
kaynak=(http://www.abisource.com/downloads/$isim/$surum/source/$isim-$surum.tar.gz) kaynak=(http://www.abisource.com/downloads/$isim/$surum/source/$isim-$surum.tar.gz
abiword-3.0.0-librevenge.patch
abiword-3.0.1-libwps-0.4.patch
aiksaurus-plugin.m4
command-plugin.m4
python-override.patch
bug13815.patch
enchant-2.1.patch
libical-deprecated.patch)
derle() { derle() {
cd $isim-$surum cd $isim-$surum
./configure --prefix=/usr # fix build with librevenge based import filters
make patch -Np0 -i ../abiword-3.0.0-librevenge.patch
make DESTDIR=$PKG install
# Başlatıcı # Fix libwpd 0.4 detection
sed -i 's/^Exec=/Name[tr]=AbiWord \ patch -Np1 -i ../abiword-3.0.1-libwps-0.4.patch
GenericName[tr]=Kelime İşlemci \
Comment[tr]=Microsoft® Word benzeri basit bir kelime işlemci yazılımı.\ # Fix python override code to work with Python 3.x
&/' $PKG/usr/share/applications/$isim.desktop patch -Np1 -i ../python-override.patch
# Fix black on black (FS#51667)
# http://bugzilla.abisource.com/show_bug.cgi?id=13815
patch -Np1 -i ../bug13815.patch
# Replace deprecated enchant functions
patch -Np1 -i ../enchant-2.1.patch
# Replace deprecated libical functions
patch -Np1 -i ../libical-deprecated.patch
# Install missing m4 file
install -m644 ../aiksaurus-plugin.m4 plugins/aiksaurus/plugin.m4
install -m644 ../command-plugin.m4 plugins/command/plugin.m4
# Generate m4 file for configure
find plugins -name plugin.m4 | xargs cat > plugin-configure.m4
# enchant-2 naming change
sed -i 's/enchant >=/enchant-2 >=/' configure.ac
libtoolize --force
autoreconf -fi
./configure --prefix=/usr \
--enable-shared \
--disable-static \
--enable-clipart \
--enable-templates \
--enable-plugins \
--enable-introspection
sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
make
make
make DESTDIR=$PKG install
# Başlatıcı
sed -i 's/^Exec=/Name[tr]=AbiWord \
GenericName[tr]=Kelime İşlemci \
Comment[tr]=Microsoft Word benzeri basit bir kelime işlemci yazılımı.\
&/' $PKG/usr/share/applications/$isim.desktop
cd src/gi-overrides
sed -i 's/python -c/python2 -c/' Makefile
make DESTDIR="$PKG" PYTHON=python2 install
} }