diff options
| -rw-r--r-- | packages/abiword/abiword-plugins_2.4.4.bb | 16 | ||||
| -rw-r--r-- | packages/abiword/files/.mtn2git_empty | 0 | ||||
| -rw-r--r-- | packages/abiword/files/abiword-plugin-pdf-poppler.patch | 11 | ||||
| -rw-r--r-- | packages/meta/slugos-packages.bb | 3 | ||||
| -rw-r--r-- | packages/perl/perl_5.8.7.bb | 1 |
5 files changed, 22 insertions, 9 deletions
diff --git a/packages/abiword/abiword-plugins_2.4.4.bb b/packages/abiword/abiword-plugins_2.4.4.bb index 89f50d0495..645db1c96b 100644 --- a/packages/abiword/abiword-plugins_2.4.4.bb +++ b/packages/abiword/abiword-plugins_2.4.4.bb @@ -4,21 +4,23 @@ MAINTAINER="Koen Kooi <koen@dominion.kabel.utwente.nl>" LICENSE="GPLv2" DEPENDS = "abiword libwpd librsvg goffice poppler" -PR="r0" +PR="r1" -SRC_URI = "http://www.abiword.org/downloads/abiword/${PV}/source/abiword-${PV}.tar.gz" +SRC_URI = "http://www.abiword.org/downloads/abiword/${PV}/source/abiword-${PV}.tar.gz \ + file://abiword-plugin-pdf-poppler.patch;patch=1;pnum=2" S = "${WORKDIR}/abiword-${PV}/abiword-plugins" -FILES_${PN} += " ${datadir}/icons/* \ -${datadir}/AbiSuite-2.4/ \ -${libdir}/AbiWord-2.4/plugins/*.so \ -" - inherit autotools PARALLEL_MAKE="" EXTRA_OECONF = "" +PACKAGES_DYNAMIC = "abiword-plugin-*" + +python populate_packages_prepend () { + abiword_libdir = bb.data.expand('${libdir}/AbiWord-2.4/plugins', d) + do_split_packages(d, abiword_libdir, '^libAbi(.*)\.so$', 'abiword-plugin-%s', 'Abiword plugin for %s') +} diff --git a/packages/abiword/files/.mtn2git_empty b/packages/abiword/files/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/abiword/files/.mtn2git_empty diff --git a/packages/abiword/files/abiword-plugin-pdf-poppler.patch b/packages/abiword/files/abiword-plugin-pdf-poppler.patch new file mode 100644 index 0000000000..c8ef3256b8 --- /dev/null +++ b/packages/abiword/files/abiword-plugin-pdf-poppler.patch @@ -0,0 +1,11 @@ +--- abiword-2.4.4/abiword-plugins/wp/impexp/pdf/xp/ie_imp_PDF.cpp.orig 2006-04-17 11:36:05.000000000 +0100 ++++ abiword-2.4.4/abiword-plugins/wp/impexp/pdf/xp/ie_imp_PDF.cpp 2006-04-17 11:37:00.000000000 +0100 +@@ -75,7 +75,7 @@ + UT_tmpnam(temporary_file); + + TextOutputDev *textOut = new TextOutputDev(temporary_file, gFalse, gFalse, gFalse); +- doc->displayPages(textOut, 1, doc->getNumPages(), 72, 72, 0, gTrue, gFalse); ++ doc->displayPages(textOut, 1, doc->getNumPages(), 72, 72, 0, gFalse, gTrue, gFalse); + delete textOut; + + IE_Imp_Text txt_imp(getDoc(), "UTF-8"); diff --git a/packages/meta/slugos-packages.bb b/packages/meta/slugos-packages.bb index 66c53218c3..217aefb976 100644 --- a/packages/meta/slugos-packages.bb +++ b/packages/meta/slugos-packages.bb @@ -114,7 +114,7 @@ SLUGOS_PACKAGES = "\ netpbm \ nmap \ ntp \ - obexftp openobex openobex-apps ircp \ + obexftp openobex-apps ircp \ openldap \ openntpd \ openssh \ @@ -165,6 +165,7 @@ SLUGOS_PACKAGES = "\ SLUGOS_BROKEN_PACKAGES = "\ icecast \ irssi \ + openobex \ pvrusb2-mci \ setpwc \ watchdog \ diff --git a/packages/perl/perl_5.8.7.bb b/packages/perl/perl_5.8.7.bb index 6743406b9b..456cc95c84 100644 --- a/packages/perl/perl_5.8.7.bb +++ b/packages/perl/perl_5.8.7.bb @@ -4,7 +4,6 @@ include perl.inc SRC_URI += "file://config.sh-armeb-linux \ file://config.sh-arm-linux \ - file://config.sh-arm-linux-gnueabi \ file://config.sh-i386-linux" PR = "r15" |