* [PATCH][meta-xfce/meta-gnome 00/10] world-fixes
@ 2014-04-01 15:21 Andreas Müller
2014-04-01 15:21 ` [PATCH][meta-xfce/meta-gnome 01/10] xfce-git.bbclass initial add Andreas Müller
` (10 more replies)
0 siblings, 11 replies; 12+ messages in thread
From: Andreas Müller @ 2014-04-01 15:21 UTC (permalink / raw)
To: openembedded-devel
mousepad seems already fixed in secret shr repo
The following changes since commit c04626475be6f0e52400552d5aed044062aac4dd:
exo: Add intltool-native as native dependency (2014-03-29 22:51:36 +0100)
are available in the git repository at:
git://gitorious.org/schnitzeltony-oe-meta/meta-openembedded.git patches-for-world
for you to fetch changes up to 4972401d7133f07f732a06d47bc9bce664465493:
abiword: update to 3.0.0 to fix build (2014-04-01 17:12:30 +0200)
----------------------------------------------------------------
Andreas Müller (10):
xfce-git.bbclass initial add
xarchiver: fix configue
xfwm4: fix configue by inheriting xfce-git.bbclass
libxfce4ui: fix configue by inheriting xfce-git.bbclass
xfce4-taskmanager: fix configue by inheriting xfce-git.bbclass
xfce4-closebutton-plugin: fix configue by inheriting xfce-git.bbclass
xfce4-settings: fix configue by inheriting xfce-git.bbclass
xfce4-dev-tools: update to 4.11.0
sound-theme-freedesktop: fix configure
abiword: update to 3.0.0 to fix build
meta-gnome/recipes-gnome/abiword/abiword/abiword-cxx-for-ld-fix.patch | 12 ---------
meta-gnome/recipes-gnome/abiword/abiword/abiword.fix.glib-2.32.patch | 21 ----------------
meta-gnome/recipes-gnome/abiword/abiword/cdump.pl | 32 ------------------------
meta-gnome/recipes-gnome/abiword/abiword/debian_patches_boost54.patch | 32 ++++++++++++++++++++++++
meta-gnome/recipes-gnome/abiword/abiword/fix.no.undefined.param.patch | 104 ----------------------------------------------------------------------------
meta-gnome/recipes-gnome/abiword/abiword/libpng15.patch | 102 --------------------------------------------------------------------------
meta-gnome/recipes-gnome/abiword/abiword/nodolt.patch | 12 ---------
meta-gnome/recipes-gnome/abiword/{abiword_2.8.6.bb => abiword_3.0.0.bb} | 39 +++++++++++------------------
meta-oe/recipes-multimedia/sound-themes/sound-theme-freedesktop_0.8.bb | 2 ++
meta-xfce/classes/xfce-git.bbclass | 5 ++++
meta-xfce/recipes-apps/xarchiver/xarchiver_git.bb | 8 ++----
meta-xfce/recipes-apps/xfce4-taskmanager/xfce4-taskmanager_git.bb | 6 +----
meta-xfce/recipes-panel-plugins/closebutton/xfce4-closebutton-plugin_git.bb | 6 +----
meta-xfce/recipes-xfce/libxfce4ui/libxfce4ui_4.10.0.bb | 8 +-----
meta-xfce/recipes-xfce/xfce4-dev-tools/{xfce4-dev-tools_4.10.0.bb => xfce4-dev-tools_4.11.0.bb} | 4 +--
meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings_git.bb | 6 +----
meta-xfce/recipes-xfce/xfwm4/xfwm4_git.bb | 6 +----
17 files changed, 63 insertions(+), 342 deletions(-)
delete mode 100644 meta-gnome/recipes-gnome/abiword/abiword/abiword-cxx-for-ld-fix.patch
delete mode 100644 meta-gnome/recipes-gnome/abiword/abiword/abiword.fix.glib-2.32.patch
delete mode 100755 meta-gnome/recipes-gnome/abiword/abiword/cdump.pl
create mode 100644 meta-gnome/recipes-gnome/abiword/abiword/debian_patches_boost54.patch
delete mode 100644 meta-gnome/recipes-gnome/abiword/abiword/fix.no.undefined.param.patch
delete mode 100644 meta-gnome/recipes-gnome/abiword/abiword/libpng15.patch
delete mode 100644 meta-gnome/recipes-gnome/abiword/abiword/nodolt.patch
rename meta-gnome/recipes-gnome/abiword/{abiword_2.8.6.bb => abiword_3.0.0.bb} (83%)
create mode 100644 meta-xfce/classes/xfce-git.bbclass
rename meta-xfce/recipes-xfce/xfce4-dev-tools/{xfce4-dev-tools_4.10.0.bb => xfce4-dev-tools_4.11.0.bb} (78%)
--
1.8.3.1
^ permalink raw reply [flat|nested] 12+ messages in thread
* [PATCH][meta-xfce/meta-gnome 01/10] xfce-git.bbclass initial add
2014-04-01 15:21 [PATCH][meta-xfce/meta-gnome 00/10] world-fixes Andreas Müller
@ 2014-04-01 15:21 ` Andreas Müller
2014-04-01 15:21 ` [PATCH][meta-xfce/meta-gnome 02/10] xarchiver: fix configue Andreas Müller
` (9 subsequent siblings)
10 siblings, 0 replies; 12+ messages in thread
From: Andreas Müller @ 2014-04-01 15:21 UTC (permalink / raw)
To: openembedded-devel
common preparations for xfce-git-repos
* implement autogen.sh call in do_configure_prepend
* AUTOTOOLS_COPYACLOCAL = "1": In oe-core commit
79ea036de331bde65a88fb777647dc099ef05acf copying aclocals was moved to
do_configure[prefuncs]. These are called before do_configure_prepend which
causes configure.ac not yet being created and autotools_copy_aclocals
returning undone.
By using this class tons of errors like
| aclocal: error: couldn't open directory '/home/a.mueller/tmp/oe-core-eglibc/work/armv7at2hf-vfp-neon-angstrom-linux-gnueabi/xfce4-settings/4.11.0+gitAUTOINC+b7a0e1fd77-r0/git/aclocal-copy/': No such file or directory
| autoreconf: aclocal failed with exit status: 1
are fixed.
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
meta-xfce/classes/xfce-git.bbclass | 5 +++++
1 file changed, 5 insertions(+)
create mode 100644 meta-xfce/classes/xfce-git.bbclass
diff --git a/meta-xfce/classes/xfce-git.bbclass b/meta-xfce/classes/xfce-git.bbclass
new file mode 100644
index 0000000..c4be554
--- /dev/null
+++ b/meta-xfce/classes/xfce-git.bbclass
@@ -0,0 +1,5 @@
+do_configure_prepend() {
+ NOCONFIGURE=yes ./autogen.sh
+}
+
+AUTOTOOLS_COPYACLOCAL = "1"
--
1.8.3.1
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [PATCH][meta-xfce/meta-gnome 02/10] xarchiver: fix configue
2014-04-01 15:21 [PATCH][meta-xfce/meta-gnome 00/10] world-fixes Andreas Müller
2014-04-01 15:21 ` [PATCH][meta-xfce/meta-gnome 01/10] xfce-git.bbclass initial add Andreas Müller
@ 2014-04-01 15:21 ` Andreas Müller
2014-04-01 15:21 ` [PATCH][meta-xfce/meta-gnome 03/10] xfwm4: fix configue by inheriting xfce-git.bbclass Andreas Müller
` (8 subsequent siblings)
10 siblings, 0 replies; 12+ messages in thread
From: Andreas Müller @ 2014-04-01 15:21 UTC (permalink / raw)
To: openembedded-devel
* use xfce-git to fix aclocal-copy error
* add intltool-native in DEPENDS to fix
| configure.in:57: error: possibly undefined macro: AC_PROG_INTLTOOL
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
meta-xfce/recipes-apps/xarchiver/xarchiver_git.bb | 8 ++------
1 file changed, 2 insertions(+), 6 deletions(-)
diff --git a/meta-xfce/recipes-apps/xarchiver/xarchiver_git.bb b/meta-xfce/recipes-apps/xarchiver/xarchiver_git.bb
index ba538e6..9e4b696 100644
--- a/meta-xfce/recipes-apps/xarchiver/xarchiver_git.bb
+++ b/meta-xfce/recipes-apps/xarchiver/xarchiver_git.bb
@@ -5,24 +5,20 @@ SECTION = "x11"
LICENSE = "GPLv2+"
LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
-DEPENDS = "gtk+ glib-2.0 xfce4-dev-tools-native"
+DEPENDS = "gtk+ glib-2.0 xfce4-dev-tools-native intltool-native"
SRC_URI = "git://gitorious.org/xfce/xarchiver.git;branch=master"
SRCREV = "e80e90528c9aab2fe36d9078b945b44c05cc20d3"
PV = "0.5.3"
S = "${WORKDIR}/git"
-inherit gettext pkgconfig autotools gtk-icon-cache
+inherit xfce-git gettext pkgconfig autotools gtk-icon-cache
# install tap files for thunar-archive-plugin in ${libdir}/thunar-archive-plugin
EXTRA_OECONF += "--libexecdir=${libdir}"
EXTRA_OECONF += "--enable-maintainer-mode"
-do_configure_prepend() {
- NOCONFIGURE=yes ./autogen.sh
-}
-
FILES_${PN} += "${libdir}/thunar-archive-plugin"
RRECOMMENDS_${PN} = "lzop zip tar bzip2 unzip xz"
--
1.8.3.1
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [PATCH][meta-xfce/meta-gnome 03/10] xfwm4: fix configue by inheriting xfce-git.bbclass
2014-04-01 15:21 [PATCH][meta-xfce/meta-gnome 00/10] world-fixes Andreas Müller
2014-04-01 15:21 ` [PATCH][meta-xfce/meta-gnome 01/10] xfce-git.bbclass initial add Andreas Müller
2014-04-01 15:21 ` [PATCH][meta-xfce/meta-gnome 02/10] xarchiver: fix configue Andreas Müller
@ 2014-04-01 15:21 ` Andreas Müller
2014-04-01 15:21 ` [PATCH][meta-xfce/meta-gnome 04/10] libxfce4ui: " Andreas Müller
` (7 subsequent siblings)
10 siblings, 0 replies; 12+ messages in thread
From: Andreas Müller @ 2014-04-01 15:21 UTC (permalink / raw)
To: openembedded-devel
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
meta-xfce/recipes-xfce/xfwm4/xfwm4_git.bb | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
diff --git a/meta-xfce/recipes-xfce/xfwm4/xfwm4_git.bb b/meta-xfce/recipes-xfce/xfwm4/xfwm4_git.bb
index 4799460..f8cd4b2 100644
--- a/meta-xfce/recipes-xfce/xfwm4/xfwm4_git.bb
+++ b/meta-xfce/recipes-xfce/xfwm4/xfwm4_git.bb
@@ -4,7 +4,7 @@ LICENSE = "GPLv2"
LIC_FILES_CHKSUM = "file://COPYING;md5=d791728a073bc009b4ffaf00b7599855"
DEPENDS = "virtual/libx11 libxpm gtk+ libxfce4util libxfce4ui xfconf libwnck dbus-glib startup-notification exo-native"
-inherit xfce update-alternatives
+inherit xfce xfce-git update-alternatives
SRC_URI = " \
git://git.xfce.org/xfce/xfwm4;protocol=git \
@@ -17,10 +17,6 @@ PV = "4.10.1+git${SRCPV}"
EXTRA_OECONF += "--enable-maintainer-mode"
-do_configure_prepend() {
- NOCONFIGURE=yes ./autogen.sh
-}
-
python populate_packages_prepend () {
themedir = d.expand('${datadir}/themes')
do_split_packages(d, themedir, '^(.*)', 'xfwm4-theme-%s', 'XFWM4 theme %s', allow_dirs=True)
--
1.8.3.1
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [PATCH][meta-xfce/meta-gnome 04/10] libxfce4ui: fix configue by inheriting xfce-git.bbclass
2014-04-01 15:21 [PATCH][meta-xfce/meta-gnome 00/10] world-fixes Andreas Müller
` (2 preceding siblings ...)
2014-04-01 15:21 ` [PATCH][meta-xfce/meta-gnome 03/10] xfwm4: fix configue by inheriting xfce-git.bbclass Andreas Müller
@ 2014-04-01 15:21 ` Andreas Müller
2014-04-01 15:21 ` [PATCH][meta-xfce/meta-gnome 05/10] xfce4-taskmanager: " Andreas Müller
` (6 subsequent siblings)
10 siblings, 0 replies; 12+ messages in thread
From: Andreas Müller @ 2014-04-01 15:21 UTC (permalink / raw)
To: openembedded-devel
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
meta-xfce/recipes-xfce/libxfce4ui/libxfce4ui_4.10.0.bb | 8 +-------
1 file changed, 1 insertion(+), 7 deletions(-)
diff --git a/meta-xfce/recipes-xfce/libxfce4ui/libxfce4ui_4.10.0.bb b/meta-xfce/recipes-xfce/libxfce4ui/libxfce4ui_4.10.0.bb
index 1e141c4..52792f5 100644
--- a/meta-xfce/recipes-xfce/libxfce4ui/libxfce4ui_4.10.0.bb
+++ b/meta-xfce/recipes-xfce/libxfce4ui/libxfce4ui_4.10.0.bb
@@ -4,7 +4,7 @@ LICENSE = "GPLv2"
LIC_FILES_CHKSUM = "file://COPYING;md5=252890d9eee26aab7b432e8b8a616475"
DEPENDS = "perl-native glib-2.0 gtk+ intltool libxfce4util xfconf xfce4-dev-tools virtual/libx11 libsm libice"
-inherit autotools gettext xfce
+inherit autotools gettext xfce xfce-git
SRC_URI = " \
git://git.xfce.org/xfce/libxfce4ui;protocol=git \
@@ -21,15 +21,9 @@ PACKAGECONFIG ??= ""
PACKAGECONFIG[gladeui] = "--enable-gladeui,--disable-gladeui,glade3"
PACKAGECONFIG[startup-notification] = "--enable-startup-notification,--disable-startup-notification,startup-notification"
-do_src_prepare() {
- NOCONFIGURE=yes ./autogen.sh
-}
-
FILES_${PN}-dbg += "${libdir}/glade3/modules/.debug"
FILES_${PN}-dev += "${libdir}/glade3/modules/*.la \
${datadir}/glade3/catalogs/*.in"
PACKAGES += "${PN}-glade"
FILES_${PN}-glade = "${libdir}/glade3 \
${datadir}/glade3"
-
-addtask do_src_prepare before do_configure after do_patch
--
1.8.3.1
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [PATCH][meta-xfce/meta-gnome 05/10] xfce4-taskmanager: fix configue by inheriting xfce-git.bbclass
2014-04-01 15:21 [PATCH][meta-xfce/meta-gnome 00/10] world-fixes Andreas Müller
` (3 preceding siblings ...)
2014-04-01 15:21 ` [PATCH][meta-xfce/meta-gnome 04/10] libxfce4ui: " Andreas Müller
@ 2014-04-01 15:21 ` Andreas Müller
2014-04-01 15:21 ` [PATCH][meta-xfce/meta-gnome 06/10] xfce4-closebutton-plugin: " Andreas Müller
` (5 subsequent siblings)
10 siblings, 0 replies; 12+ messages in thread
From: Andreas Müller @ 2014-04-01 15:21 UTC (permalink / raw)
To: openembedded-devel
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
meta-xfce/recipes-apps/xfce4-taskmanager/xfce4-taskmanager_git.bb | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
diff --git a/meta-xfce/recipes-apps/xfce4-taskmanager/xfce4-taskmanager_git.bb b/meta-xfce/recipes-apps/xfce4-taskmanager/xfce4-taskmanager_git.bb
index 88e646b..289cf55 100644
--- a/meta-xfce/recipes-apps/xfce4-taskmanager/xfce4-taskmanager_git.bb
+++ b/meta-xfce/recipes-apps/xfce4-taskmanager/xfce4-taskmanager_git.bb
@@ -2,7 +2,7 @@ SUMMARY = "Easy to use task manager"
LICENSE = "GPLv2"
LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
-inherit xfce-app
+inherit xfce-git xfce-app
DEPENDS = "gtk+ cairo libwnck xfce4-dev-tools-native exo-native"
@@ -16,7 +16,3 @@ S = "${WORKDIR}/git"
PV = "1.0.0+git${SRCPV}"
EXTRA_OECONF += "--enable-maintainer-mode"
-
-do_configure_prepend() {
- NOCONFIGURE=yes ./autogen.sh
-}
--
1.8.3.1
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [PATCH][meta-xfce/meta-gnome 06/10] xfce4-closebutton-plugin: fix configue by inheriting xfce-git.bbclass
2014-04-01 15:21 [PATCH][meta-xfce/meta-gnome 00/10] world-fixes Andreas Müller
` (4 preceding siblings ...)
2014-04-01 15:21 ` [PATCH][meta-xfce/meta-gnome 05/10] xfce4-taskmanager: " Andreas Müller
@ 2014-04-01 15:21 ` Andreas Müller
2014-04-01 15:21 ` [PATCH][meta-xfce/meta-gnome 07/10] xfce4-settings: " Andreas Müller
` (4 subsequent siblings)
10 siblings, 0 replies; 12+ messages in thread
From: Andreas Müller @ 2014-04-01 15:21 UTC (permalink / raw)
To: openembedded-devel
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
.../closebutton/xfce4-closebutton-plugin_git.bb | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
diff --git a/meta-xfce/recipes-panel-plugins/closebutton/xfce4-closebutton-plugin_git.bb b/meta-xfce/recipes-panel-plugins/closebutton/xfce4-closebutton-plugin_git.bb
index e095899..f96009e 100644
--- a/meta-xfce/recipes-panel-plugins/closebutton/xfce4-closebutton-plugin_git.bb
+++ b/meta-xfce/recipes-panel-plugins/closebutton/xfce4-closebutton-plugin_git.bb
@@ -3,7 +3,7 @@ SECTION = "x11"
LICENSE = "GPLv2"
LIC_FILES_CHKSUM = "file://COPYING;md5=b6952d9a47fc2ad0f315510e1290455f"
-inherit xfce-panel-plugin gtk-icon-cache perlnative
+inherit xfce-panel-plugin xfce-git gtk-icon-cache perlnative
DEPENDS += "exo-native libwnck xfconf"
@@ -15,8 +15,4 @@ S = "${WORKDIR}/git"
EXTRA_OECONF += "--enable-maintainer-mode"
-do_configure_prepend() {
- NOCONFIGURE=yes ./autogen.sh
-}
-
FILES_${PN} += "${datadir}/xfce4/closebutton/themes"
--
1.8.3.1
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [PATCH][meta-xfce/meta-gnome 07/10] xfce4-settings: fix configue by inheriting xfce-git.bbclass
2014-04-01 15:21 [PATCH][meta-xfce/meta-gnome 00/10] world-fixes Andreas Müller
` (5 preceding siblings ...)
2014-04-01 15:21 ` [PATCH][meta-xfce/meta-gnome 06/10] xfce4-closebutton-plugin: " Andreas Müller
@ 2014-04-01 15:21 ` Andreas Müller
2014-04-01 15:21 ` [PATCH][meta-xfce/meta-gnome 08/10] xfce4-dev-tools: update to 4.11.0 Andreas Müller
` (3 subsequent siblings)
10 siblings, 0 replies; 12+ messages in thread
From: Andreas Müller @ 2014-04-01 15:21 UTC (permalink / raw)
To: openembedded-devel
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings_git.bb | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
diff --git a/meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings_git.bb b/meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings_git.bb
index f7fc244..b34bb7a 100644
--- a/meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings_git.bb
+++ b/meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings_git.bb
@@ -4,7 +4,7 @@ LICENSE = "GPLv2"
LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
DEPENDS = "exo exo-native garcon gtk+ libxfce4util libxfce4ui xfconf dbus-glib libxi virtual/libx11 xrandr libnotify libxcursor libxklavier"
-inherit xfce
+inherit xfce xfce-git
SRC_URI = " git://gitorious.org/xfce/xfce4-settings.git;protocol=git;branch=for-oe \
file://0001-xsettings.xml-remove-trouble-causing-comment.patch \
@@ -31,10 +31,6 @@ PACKAGECONFIG[datetime-setter] = "--enable-datetime-settings, --disable-datetime
PACKAGECONFIG[notify] = "--enable-libnotify,--disable-libnotify,libnotify"
PACKAGECONFIG[sound-setter] = "--enable-sound-settings, --disable-sound-settings, libcanberra, libcanberra-gtk2 sound-theme-freedesktop"
-do_configure_prepend() {
- NOCONFIGURE=yes ./autogen.sh
-}
-
FILES_${PN} += " \
${libdir}/xfce4 \
${datadir}/xfce4 \
--
1.8.3.1
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [PATCH][meta-xfce/meta-gnome 08/10] xfce4-dev-tools: update to 4.11.0
2014-04-01 15:21 [PATCH][meta-xfce/meta-gnome 00/10] world-fixes Andreas Müller
` (6 preceding siblings ...)
2014-04-01 15:21 ` [PATCH][meta-xfce/meta-gnome 07/10] xfce4-settings: " Andreas Müller
@ 2014-04-01 15:21 ` Andreas Müller
2014-04-01 15:21 ` [PATCH][meta-xfce/meta-gnome 09/10] sound-theme-freedesktop: fix configure Andreas Müller
` (2 subsequent siblings)
10 siblings, 0 replies; 12+ messages in thread
From: Andreas Müller @ 2014-04-01 15:21 UTC (permalink / raw)
To: openembedded-devel
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
.../{xfce4-dev-tools_4.10.0.bb => xfce4-dev-tools_4.11.0.bb} | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename meta-xfce/recipes-xfce/xfce4-dev-tools/{xfce4-dev-tools_4.10.0.bb => xfce4-dev-tools_4.11.0.bb} (78%)
diff --git a/meta-xfce/recipes-xfce/xfce4-dev-tools/xfce4-dev-tools_4.10.0.bb b/meta-xfce/recipes-xfce/xfce4-dev-tools/xfce4-dev-tools_4.11.0.bb
similarity index 78%
rename from meta-xfce/recipes-xfce/xfce4-dev-tools/xfce4-dev-tools_4.10.0.bb
rename to meta-xfce/recipes-xfce/xfce4-dev-tools/xfce4-dev-tools_4.11.0.bb
index 68e848a..3312fbd 100644
--- a/meta-xfce/recipes-xfce/xfce4-dev-tools/xfce4-dev-tools_4.10.0.bb
+++ b/meta-xfce/recipes-xfce/xfce4-dev-tools/xfce4-dev-tools_4.11.0.bb
@@ -10,8 +10,8 @@ inherit autotools
BBCLASSEXTEND = "native"
SRC_URI = "http://archive.xfce.org/src/xfce/${BPN}/${@'${PV}'[0:4]}/${BPN}-${PV}.tar.bz2"
-SRC_URI[md5sum] = "372b74f432e7e02d946c2ea9d3de2805"
-SRC_URI[sha256sum] = "f79649bbfbbf16881494ee9f67035063765aec12e23ab9bac31de2c8a4f32bf8"
+SRC_URI[md5sum] = "36112d0256092c30bd1b47105c547edf"
+SRC_URI[sha256sum] = "2dccdd4935716a97db28464ba2403572ce03134fd7adf294e1a59eaf297e6555"
do_install_append() {
install -d ${D}${datadir}/aclocal
--
1.8.3.1
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [PATCH][meta-xfce/meta-gnome 09/10] sound-theme-freedesktop: fix configure
2014-04-01 15:21 [PATCH][meta-xfce/meta-gnome 00/10] world-fixes Andreas Müller
` (7 preceding siblings ...)
2014-04-01 15:21 ` [PATCH][meta-xfce/meta-gnome 08/10] xfce4-dev-tools: update to 4.11.0 Andreas Müller
@ 2014-04-01 15:21 ` Andreas Müller
2014-04-01 15:21 ` [PATCH][meta-xfce/meta-gnome 10/10] abiword: update to 3.0.0 to fix build Andreas Müller
2014-04-20 8:53 ` [PATCH][meta-xfce/meta-gnome 00/10] world-fixes Martin Jansa
10 siblings, 0 replies; 12+ messages in thread
From: Andreas Müller @ 2014-04-01 15:21 UTC (permalink / raw)
To: openembedded-devel
oe-core's
commit 79ea036de331bde65a88fb777647dc099ef05acf
Author: Richard Purdie <richard.purdie@linuxfoundation.org>
Date: Sun Mar 2 17:36:38 2014 +0000
autotools: Limit aclocal files to those in dependencies
makes explicit depencies mandatory
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
meta-oe/recipes-multimedia/sound-themes/sound-theme-freedesktop_0.8.bb | 2 ++
1 file changed, 2 insertions(+)
diff --git a/meta-oe/recipes-multimedia/sound-themes/sound-theme-freedesktop_0.8.bb b/meta-oe/recipes-multimedia/sound-themes/sound-theme-freedesktop_0.8.bb
index 71f4053..9c4f9c0 100644
--- a/meta-oe/recipes-multimedia/sound-themes/sound-theme-freedesktop_0.8.bb
+++ b/meta-oe/recipes-multimedia/sound-themes/sound-theme-freedesktop_0.8.bb
@@ -5,6 +5,8 @@ LIC_FILES_CHKSUM = "file://CREDITS;md5=3213e601ce34bb42ddc3498903ac4e69"
inherit autotools gettext
+DEPENDS += "glib-2.0-native intltool-native"
+
SRC_URI = "http://people.freedesktop.org/~mccann/dist/${BPN}-${PV}.tar.bz2"
SRC_URI[md5sum] = "d7387912cfd275282d1ec94483cb2f62"
SRC_URI[sha256sum] = "cb518b20eef05ec2e82dda1fa89a292c1760dc023aba91b8aa69bafac85e8a14"
--
1.8.3.1
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [PATCH][meta-xfce/meta-gnome 10/10] abiword: update to 3.0.0 to fix build
2014-04-01 15:21 [PATCH][meta-xfce/meta-gnome 00/10] world-fixes Andreas Müller
` (8 preceding siblings ...)
2014-04-01 15:21 ` [PATCH][meta-xfce/meta-gnome 09/10] sound-theme-freedesktop: fix configure Andreas Müller
@ 2014-04-01 15:21 ` Andreas Müller
2014-04-20 8:53 ` [PATCH][meta-xfce/meta-gnome 00/10] world-fixes Martin Jansa
10 siblings, 0 replies; 12+ messages in thread
From: Andreas Müller @ 2014-04-01 15:21 UTC (permalink / raw)
To: openembedded-devel
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
.../abiword/abiword/abiword-cxx-for-ld-fix.patch | 12 ---
.../abiword/abiword/abiword.fix.glib-2.32.patch | 21 -----
meta-gnome/recipes-gnome/abiword/abiword/cdump.pl | 32 -------
.../abiword/abiword/debian_patches_boost54.patch | 32 +++++++
.../abiword/abiword/fix.no.undefined.param.patch | 104 ---------------------
.../recipes-gnome/abiword/abiword/libpng15.patch | 102 --------------------
.../recipes-gnome/abiword/abiword/nodolt.patch | 12 ---
.../abiword/{abiword_2.8.6.bb => abiword_3.0.0.bb} | 39 +++-----
8 files changed, 47 insertions(+), 307 deletions(-)
delete mode 100644 meta-gnome/recipes-gnome/abiword/abiword/abiword-cxx-for-ld-fix.patch
delete mode 100644 meta-gnome/recipes-gnome/abiword/abiword/abiword.fix.glib-2.32.patch
delete mode 100755 meta-gnome/recipes-gnome/abiword/abiword/cdump.pl
create mode 100644 meta-gnome/recipes-gnome/abiword/abiword/debian_patches_boost54.patch
delete mode 100644 meta-gnome/recipes-gnome/abiword/abiword/fix.no.undefined.param.patch
delete mode 100644 meta-gnome/recipes-gnome/abiword/abiword/libpng15.patch
delete mode 100644 meta-gnome/recipes-gnome/abiword/abiword/nodolt.patch
rename meta-gnome/recipes-gnome/abiword/{abiword_2.8.6.bb => abiword_3.0.0.bb} (83%)
diff --git a/meta-gnome/recipes-gnome/abiword/abiword/abiword-cxx-for-ld-fix.patch b/meta-gnome/recipes-gnome/abiword/abiword/abiword-cxx-for-ld-fix.patch
deleted file mode 100644
index e49b1e9..0000000
--- a/meta-gnome/recipes-gnome/abiword/abiword/abiword-cxx-for-ld-fix.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-libstc++ isn't in staging anymore, so we must use g++ for linking
-
---- /tmp/configure.ac 2008-03-31 11:39:13.130631737 +0200
-+++ abiword-plugins-2.6.0/configure.ac 2008-03-31 11:39:22.754586487 +0200
-@@ -14,6 +14,7 @@
- AC_PROG_INSTALL
- AC_PROG_LN_S
- AC_PROG_MAKE_SET
-+AC_LANG_CPLUSPLUS
-
- AM_INIT_AUTOMAKE
-
diff --git a/meta-gnome/recipes-gnome/abiword/abiword/abiword.fix.glib-2.32.patch b/meta-gnome/recipes-gnome/abiword/abiword/abiword.fix.glib-2.32.patch
deleted file mode 100644
index e466ef6..0000000
--- a/meta-gnome/recipes-gnome/abiword/abiword/abiword.fix.glib-2.32.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- abiword-2.8.6/goffice-bits/goffice/app/goffice-app.h 2012-04-30 15:06:28.000000000 +0200
-+++ abiword-2.8.6.orig/goffice-bits/goffice/app/goffice-app.h 2007-01-17 00:17:27.000000000 +0100
-@@ -22,7 +22,7 @@
- #ifndef GOFFICE_APP_H
- #define GOFFICE_APP_H
-
--#include <glib/gmacros.h>
-+#include <glib.h>
-
- G_BEGIN_DECLS
-
---- abiword-2.8.6/src/af/util/xp/ut_go_file.h 2012-04-30 15:08:43.000000000 +0200
-+++ abiword-2.8.6.orig/src/af/util/xp/ut_go_file.h 2009-08-27 15:27:10.000000000 +0200
-@@ -31,7 +31,6 @@
-
- #include <glib.h>
- #include <gsf/gsf.h>
--#include <glib/gerror.h>
- #include <time.h>
-
- G_BEGIN_DECLS
diff --git a/meta-gnome/recipes-gnome/abiword/abiword/cdump.pl b/meta-gnome/recipes-gnome/abiword/abiword/cdump.pl
deleted file mode 100755
index 76f9c88..0000000
--- a/meta-gnome/recipes-gnome/abiword/abiword/cdump.pl
+++ /dev/null
@@ -1,32 +0,0 @@
-#!/usr/bin/perl
-
-# This script replace the cdump tool we used to build the ap_wp_Splash.cpp
-# Because the cdump tool has to be run as a part of building the AW package,
-# it breaks cross-compilation. A perl script seemed like a generic solution
-
-
-if ($#ARGV != 1 )
-{
- print "Usage: $0 datafile arrayname $#ARGV $ARGV[0] $ARGV[1]\n";
- exit(-1);
-}
-
-open FROM, "<$ARGV[0]" or die "Could not open file $ARGV[0]";
-binmode FROM;
-
-print "unsigned char $ARGV[1] [] = {\n";
-
-while ($len = read(FROM, $buf, 16))
-{
- foreach(split(//,$buf))
- {
- printf("0x%02x,", ord($_));
- }
-
- print "\n";
-}
-
-
-printf "};\nunsigned long $ARGV[1]_sizeof = sizeof($ARGV[1]);\n";
-
-close FROM;
\ No newline at end of file
diff --git a/meta-gnome/recipes-gnome/abiword/abiword/debian_patches_boost54.patch b/meta-gnome/recipes-gnome/abiword/abiword/debian_patches_boost54.patch
new file mode 100644
index 0000000..cf50cb2
--- /dev/null
+++ b/meta-gnome/recipes-gnome/abiword/abiword/debian_patches_boost54.patch
@@ -0,0 +1,32 @@
+Last-Update: 2014-02-05
+Forwarded: yes
+Author: Dmitry Smirnov <onlyjob@member.fsf.org>
+Bug-Debian: http://bugs.debian.org/737551
+Bug-Abiword: http://bugzilla.abisource.com/13602
+Description: fix FTBFS with libboost1.54-dev
+Upstream-Status: Applied
+
+--- a/plugins/collab/core/sync/xp/SynchronizedQueue.h
++++ b/plugins/collab/core/sync/xp/SynchronizedQueue.h
+@@ -21,8 +21,9 @@
+
+ #include <deque>
+ #include <boost/bind.hpp>
+ #include <boost/function.hpp>
++#include <boost/noncopyable.hpp>
+ #include <sync/xp/lock.h>
+ #include <sync/xp/Synchronizer.h>
+
+ class EmptyQueueException {};
+--- a/plugins/collab/backends/tcp/xp/Session.h
++++ b/plugins/collab/backends/tcp/xp/Session.h
+@@ -21,8 +21,9 @@
+
+ #include <boost/function.hpp>
+ #include <boost/bind.hpp>
+ #include <boost/enable_shared_from_this.hpp>
++#include <boost/noncopyable.hpp>
+ #include <deque>
+ #include <sync/xp/lock.h>
+ #include <sync/xp/Synchronizer.h>
+
diff --git a/meta-gnome/recipes-gnome/abiword/abiword/fix.no.undefined.param.patch b/meta-gnome/recipes-gnome/abiword/abiword/fix.no.undefined.param.patch
deleted file mode 100644
index aaccf09..0000000
--- a/meta-gnome/recipes-gnome/abiword/abiword/fix.no.undefined.param.patch
+++ /dev/null
@@ -1,104 +0,0 @@
-| make[3]: Entering directory
-`/OE/shr-core/tmp/work/armv7a-vfp-neon-oe-linux-gnueabi/abiword-2.8.6-r0/abiword-2.8.6/src'
-| /bin/sh ../arm-oe-linux-gnueabi-libtool --tag=CXX --mode=link
-arm-oe-linux-gnueabi-g++ -march=armv7-a -fno-tree-vectorize
--mthumb-interwork -mfloat-abi=softfp -mfpu=neon -mtune=cortex-a8
---sysroot=/OE/shr-core/tmp/sysroots/nokia900 -O2 -pipe -g
--feliminate-unused-debug-types -fpermissive
--fvisibility-inlines-hidden --no-undefined -avoid-version
--export-dynamic -Wl,-O1 -Wl,--hash-style=gnu -Wl,--as-needed -o
-abiword abiword-UnixMain.o libabiword-2.8.la -pthread -lfribidi -lwv
--lpng -lgsf-1 -lxml2 -lenchant -lz -lgtk-x11-2.0 -lgdk-x11-2.0
--latk-1.0 -lpangoft2-1.0 -lpangocairo-1.0 -lpango-1.0 -lfreetype
--lfontconfig -lrsvg-2 -lm -lgio-2.0 -lgdk_pixbuf-2.0 -lcairo
--lgmodule-2.0 -lgobject-2.0 -lgthread-2.0 -lrt -lglib-2.0 -ljpeg
-| arm-oe-linux-gnueabi-libtool: link: arm-oe-linux-gnueabi-g++
--march=armv7-a -fno-tree-vectorize -mthumb-interwork
--mfloat-abi=softfp -mfpu=neon -mtune=cortex-a8
---sysroot=/OE/shr-core/tmp/sysroots/nokia900 -O2 -pipe -g
--feliminate-unused-debug-types -fpermissive
--fvisibility-inlines-hidden --no-undefined -Wl,-O1
--Wl,--hash-style=gnu -Wl,--as-needed -o .libs/abiword
-abiword-UnixMain.o -pthread -Wl,--export-dynamic
-./.libs/libabiword-2.8.so -L=/usr/lib
-/OE/shr-core/tmp/sysroots/nokia900/usr/lib/libfribidi.so
-/OE/shr-core/tmp/sysroots/nokia900/usr/lib/libwv.so
-/OE/shr-core/tmp/sysroots/nokia900/usr/lib/libgsf-1.so
-/OE/shr-core/tmp/sysroots/nokia900/usr/lib/libbz2.so
-/OE/shr-core/tmp/sysroots/nokia900/usr/lib/libenchant.so
-/OE/shr-core/tmp/sysroots/nokia900/usr/lib/libgtk-x11-2.0.so
-/OE/shr-core/tmp/sysroots/nokia900/usr/lib/libgdk-x11-2.0.so
-/OE/shr-core/tmp/sysroots/nokia900/usr/lib/libatk-1.0.so
-/OE/shr-core/tmp/sysroots/nokia900/usr/lib/librsvg-2.so
-/OE/shr-core/tmp/sysroots/nokia900/usr/lib/libxml2.so
-/OE/shr-core/tmp/sysroots/nokia900/usr/lib/libpangocairo-1.0.so
-/OE/shr-core/tmp/sysroots/nokia900/usr/lib/libpangoft2-1.0.so
-/OE/shr-core/tmp/sysroots/nokia900/usr/lib/libstdc++.so
-/OE/shr-core/tmp/sysroots/nokia900/usr/lib/libpango-1.0.so
-/OE/shr-core/tmp/sysroots/nokia900/usr/lib/libgdk_pixbuf-2.0.so
-/OE/shr-core/tmp/sysroots/nokia900/usr/lib/libgio-2.0.so -lresolv
-/OE/shr-core/tmp/sysroots/nokia900/usr/lib/libcairo.so
-/OE/shr-core/tmp/sysroots/nokia900/usr/lib/libpixman-1.so
-/OE/shr-core/tmp/sysroots/nokia900/usr/lib/libfontconfig.so
-/OE/shr-core/tmp/sysroots/nokia900/usr/lib/libexpat.so
-/OE/shr-core/tmp/sysroots/nokia900/usr/lib/libfreetype.so
-/OE/shr-core/tmp/sysroots/nokia900/usr/lib/libpng12.so
-/OE/shr-core/tmp/sysroots/nokia900/usr/lib/libXrender.so
-/OE/shr-core/tmp/sysroots/nokia900/usr/lib/libX11.so
-/OE/shr-core/tmp/sysroots/nokia900/usr/lib/libxcb.so
-/OE/shr-core/tmp/sysroots/nokia900/usr/lib/libXau.so
-/OE/shr-core/tmp/sysroots/nokia900/usr/lib/libXdmcp.so
-/OE/shr-core/tmp/sysroots/nokia900/usr/lib/libERROR: Function
-'do_compile' failed (see
-/OE/shr-core/tmp/work/armv7a-vfp-neon-oe-linux-gnueabi/abiword-2.8.6-r0/temp/log.do_compile.10916
-for further information)
-| z.so -lm /OE/shr-core/tmp/sysroots/nokia900/usr/lib/libgmodule-2.0.so
--ldl /OE/shr-core/tmp/sysroots/nokia900/usr/lib/libgobject-2.0.so
-/OE/shr-core/tmp/sysroots/nokia900/usr/lib/libffi.so
-/OE/shr-core/tmp/sysroots/nokia900/usr/lib/libgthread-2.0.so -lpthread
-/OE/shr-core/tmp/sysroots/nokia900/usr/lib/libglib-2.0.so -lrt
-/OE/shr-core/tmp/sysroots/nokia900/usr/lib/libjpeg.so -pthread
-| arm-oe-linux-gnueabi-g++: error: unrecognized option '--no-undefined'
-| make[3]: *** [abiword] Error 1
-| make[3]: Leaving directory
-`/OE/shr-core/tmp/work/armv7a-vfp-neon-oe-linux-gnueabi/abiword-2.8.6-r0/abiword-2.8.6/src'
-
-Maybe it's related to
-http://lists.gnu.org/archive/html/libtool/2011-03/msg00015.html
-
-Remove extra '-' in no-undefined.
-
-Upstream-Status: Pending
-
-Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
-
-diff -uNr abiword-2.8.6.orig/src/Makefile.am abiword-2.8.6/src/Makefile.am
---- abiword-2.8.6.orig/src/Makefile.am 2009-09-09 15:11:01.000000000 +0200
-+++ abiword-2.8.6/src/Makefile.am 2011-11-23 09:06:06.000000000 +0100
-@@ -44,7 +44,7 @@
-
- libabiword_2_8_la_LDFLAGS = \
- $(DEPS_LIBS) \
-- --no-undefined \
-+ -no-undefined \
- -avoid-version \
- -export-dynamic
-
-@@ -107,7 +107,7 @@
-
- AbiWord_LDFLAGS = \
- $(DEPS_LIBS) \
-- --no-undefined \
-+ -no-undefined \
- -avoid-version \
- -export-dynamic \
- -headerpad_max_install_names
-@@ -129,7 +129,7 @@
-
- abiword_LDFLAGS = \
- $(platform_ldflags) \
-- --no-undefined \
-+ -no-undefined \
- -avoid-version \
- -export-dynamic
-
diff --git a/meta-gnome/recipes-gnome/abiword/abiword/libpng15.patch b/meta-gnome/recipes-gnome/abiword/abiword/libpng15.patch
deleted file mode 100644
index 0fc93c5..0000000
--- a/meta-gnome/recipes-gnome/abiword/abiword/libpng15.patch
+++ /dev/null
@@ -1,102 +0,0 @@
-Imported from gentoo
-
-$NetBSD: patch-plugins_bmp_xp_ie__impGraphic__BMP.cpp,v 1.1 2011/02/01 10:48:15 wiz Exp $
-
-Fix build with png-1.5.
-
---- a/plugins/bmp/xp/ie_impGraphic_BMP.cpp.orig 2009-06-25 04:02:06.000000000 +0000
-+++ b/plugins/bmp/xp/ie_impGraphic_BMP.cpp
-@@ -191,7 +191,10 @@ UT_Error IE_ImpGraphic_BMP::_convertGrap
-
- /* Clean Up Memory Used */
-
-- FREEP(m_pPNGInfo->palette);
-+ png_colorp palette;
-+ int num_palette;
-+ png_get_PLTE( m_pPNG, m_pPNGInfo, &palette, &num_palette );
-+ FREEP(palette);
- DELETEP(pBB);
- png_destroy_write_struct(&m_pPNG, &m_pPNGInfo);
-
-@@ -313,7 +316,7 @@ UT_Error IE_ImpGraphic_BMP::Initialize_P
- * 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 +335,7 @@ UT_Error IE_ImpGraphic_BMP::Initialize_P
- 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 +375,7 @@ UT_Error IE_ImpGraphic_BMP::Initialize_P
- 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;
-
-$NetBSD: patch-plugins_garble_xp_abiword-garble-png.cpp,v 1.1 2011/02/01 10:48:15 wiz Exp $
-
-Fix build with png-1.5.
-
---- a/plugins/garble/xp/abiword-garble-png.cpp.orig 2009-09-05 15:34:44.000000000 +0000
-+++ b/plugins/garble/xp/abiword-garble-png.cpp
-@@ -79,7 +79,7 @@ bool abiword_document::garble_png( void*
- 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 );
- }
-
-$NetBSD: patch-af,v 1.12 2011/01/15 15:07:11 wiz Exp $
-
-Fix build with png-1.5.
-
---- a/src/wp/impexp/gtk/ie_impGraphic_GdkPixbuf.cpp.orig 2009-07-01 04:02:04.000000000 +0000
-+++ b/src/wp/impexp/gtk/ie_impGraphic_GdkPixbuf.cpp
-@@ -185,7 +185,7 @@ UT_Error IE_ImpGraphic_GdkPixbuf::import
- /** 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 @@ UT_Error IE_ImpGraphic_GdkPixbuf::Initia
- * 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);
-$NetBSD: patch-ae,v 1.21 2011/01/15 15:07:11 wiz Exp $
-
-Fix build with png-1.5.
-
---- a/src/af/util/xp/ut_png.cpp.orig 2008-02-24 03:33:07.000000000 +0000
-+++ b/src/af/util/xp/ut_png.cpp
-@@ -71,7 +71,7 @@ bool UT_PNG_getDimensions(const UT_ByteB
- * 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<png_infopp>(NULL));
diff --git a/meta-gnome/recipes-gnome/abiword/abiword/nodolt.patch b/meta-gnome/recipes-gnome/abiword/abiword/nodolt.patch
deleted file mode 100644
index 1546720..0000000
--- a/meta-gnome/recipes-gnome/abiword/abiword/nodolt.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: abiword-2.8.1/configure.in
-===================================================================
---- abiword-2.8.1.orig/configure.in
-+++ abiword-2.8.1/configure.in
-@@ -132,7 +132,6 @@ AC_PROG_INSTALL
- #AC_DISABLE_STATIC
- AC_LIBTOOL_WIN32_DLL
- AC_PROG_LIBTOOL
--DOLT
- AC_PROG_LN_S
-
- AC_MSG_CHECKING([for platform and toolkit])
diff --git a/meta-gnome/recipes-gnome/abiword/abiword_2.8.6.bb b/meta-gnome/recipes-gnome/abiword/abiword_3.0.0.bb
similarity index 83%
rename from meta-gnome/recipes-gnome/abiword/abiword_2.8.6.bb
rename to meta-gnome/recipes-gnome/abiword/abiword_3.0.0.bb
index de1b335..69d62ef 100644
--- a/meta-gnome/recipes-gnome/abiword/abiword_2.8.6.bb
+++ b/meta-gnome/recipes-gnome/abiword/abiword_3.0.0.bb
@@ -4,36 +4,29 @@ SECTION = "x11/office"
LICENSE = "GPLv2"
LIC_FILES_CHKSUM = "file://COPYING;md5=ecd3ac329fca77e2d0e412bec38e1c20"
DEPENDS = "perl-native wv libglade libfribidi jpeg libpng \
- librsvg libwmf-native gtkmathview asio"
+ librsvg libwmf-native gtkmathview asio gtk+"
RDEPENDS_${PN} = "glibc-gconv-ibm850 glibc-gconv-cp1252 \
glibc-gconv-iso8859-15 glibc-gconv-iso8859-1"
RCONFLICTS_${PN} = "${PN}-embedded"
SRC_URI = "http://www.abisource.com/downloads/${BPN}/${PV}/source/${BP}.tar.gz \
+ file://debian_patches_boost54.patch \
file://autogen-common.sh \
- file://nodolt.patch \
- file://fix.no.undefined.param.patch \
- file://abiword.fix.glib-2.32.patch \
- file://libpng15.patch \
"
-LIC_FILES_CHKSUM = "file://COPYING;md5=ecd3ac329fca77e2d0e412bec38e1c20"
+LIC_FILES_CHKSUM = "file://COPYING;md5=c5edcc3ccd864b19004d14e9c1c9a26a"
-SRC_URI[md5sum] = "f883b0a7f26229a9c66fd6a1a94381aa"
-SRC_URI[sha256sum] = "d99089a63a6cfc1a6a4a026be9278028d47d224088d24b1853acb67e95683a15"
+SRC_URI[md5sum] = "8d9c41cff3a8fbef8d0c835c65600e65"
+SRC_URI[sha256sum] = "d17e318c00ff4eb353e0e7994b098b1d4f9ddd8712ac0261a0e38b89081fac01"
-#want 2.x from 2.x.y for the installation directory
+#want 3.x from 3.x.y for the installation directory
SHRT_VER = "${@d.getVar('PV',1).split('.')[0]}.${@d.getVar('PV',1).split('.')[1]}"
-PR = "r8"
-
inherit autotools pkgconfig
-PARALLEL_MAKE = ""
-
PACKAGECONFIG ??= "collab-backend-xmpp collab-backend-tcp collab-backend-service"
PACKAGECONFIG[spell] = "--enable-spell,--disable-spell,enchant"
-PACKAGECONFIG[collab-backend-xmpp] = "--enable-collab-backend-xmpp,--disable-collab-backend-xmpp,libgsf libxml2 loudmouth gtk+"
+PACKAGECONFIG[collab-backend-xmpp] = "--enable-collab-backend-xmpp,--disable-collab-backend-xmpp,libgsf libxml2 loudmouth"
PACKAGECONFIG[collab-backend-tcp] = "--enable-collab-backend-tcp,--disable-collab-backend-tcp,libgsf libxml2"
PACKAGECONFIG[collab-backend-service] = "--enable-collab-backend-service,--disable-collab-backend-service,libgsf libxml2 libsoup-2.4 gnutls"
PACKAGECONFIG[collab-backend-telepathy] = "--enable-collab-backend-telepathy,--disable-collab-backend-telepathy,libgsf libxml2 telepathy-glib telepathy-mission-control"
@@ -41,7 +34,10 @@ PACKAGECONFIG[collab-backend-sugar] = "--enable-collab-backend-sugar,--disable-c
EXTRA_OECONF = " --disable-static \
--enable-plugins \
+ --enable-clipart \
+ --enable-templates \
--without-gnomevfs \
+ --with-gtk2 \
--with-libwmf-config=${STAGING_DIR} \
"
@@ -54,13 +50,7 @@ do_configure() {
autotools_do_configure
}
-do_install_append() {
- install -d ${D}${datadir}/pixmaps/
- mv ${D}${datadir}/icons/* ${D}${datadir}/pixmaps/
- rmdir ${D}${datadir}/icons
-}
-
-PACKAGES += " ${PN}-clipart ${PN}-icons ${PN}-strings ${PN}-systemprofiles ${PN}-templates "
+PACKAGES += " ${PN}-clipart ${PN}-strings ${PN}-systemprofiles ${PN}-templates "
FILES_${PN} += " \
${libdir}/lib${PN}-*.so \
@@ -86,7 +76,7 @@ FILES_${PN} += " \
${datadir}/${PN}-${SHRT_VER}/Pr*.xml \
"
-# don't steal /usr/lib/libabiword-2.8.so from ${PN}
+# don't steal /usr/lib/libabiword-3.0.so from ${PN}
# in this case it's needed in ${PN}
FILES_${PN}-dev = " \
${includedir} \
@@ -101,7 +91,6 @@ FILES_${PN}-doc += "${datadir}/${PN}-*/readme*"
FILES_${PN}-strings += "${datadir}/${PN}-${SHRT_VER}/strings"
FILES_${PN}-systemprofiles += "${datadir}/${PN}-${SHRT_VER}/system.profile*"
FILES_${PN}-clipart += "${datadir}/${PN}-${SHRT_VER}/clipart"
-FILES_${PN}-icons += "${datadir}/${PN}-${SHRT_VER}/icons"
FILES_${PN}-strings += "${datadir}/${PN}-${SHRT_VER}/AbiWord/strings"
FILES_${PN}-systemprofiles += "${datadir}/${PN}-${SHRT_VER}/AbiWord/system.profile*"
FILES_${PN}-templates += "${datadir}/${PN}-${SHRT_VER}/templates"
@@ -109,7 +98,7 @@ FILES_${PN}-templates += "${datadir}/${PN}-${SHRT_VER}/templates"
PACKAGES_DYNAMIC += "^${PN}-meta.* ^${PN}-plugin-.*"
python populate_packages_prepend () {
- abiword_libdir = d.expand('${libdir}/abiword-2.8/plugins')
+ abiword_libdir = d.expand('${libdir}/${PN}-${SHRT_VER}/plugins')
do_split_packages(d, abiword_libdir, '(.*)\.so$', 'abiword-plugin-%s', 'Abiword plugin for %s', extra_depends='')
metapkg = "abiword-meta"
@@ -127,3 +116,5 @@ python populate_packages_prepend () {
packages.append(metapkg)
d.setVar('PACKAGES', ' '.join(packages))
}
+
+FILES_${PN}-plugin-openxml += "${datadir}/${PN}-${SHRT_VER}/omml_xslt"
--
1.8.3.1
^ permalink raw reply related [flat|nested] 12+ messages in thread
* Re: [PATCH][meta-xfce/meta-gnome 00/10] world-fixes
2014-04-01 15:21 [PATCH][meta-xfce/meta-gnome 00/10] world-fixes Andreas Müller
` (9 preceding siblings ...)
2014-04-01 15:21 ` [PATCH][meta-xfce/meta-gnome 10/10] abiword: update to 3.0.0 to fix build Andreas Müller
@ 2014-04-20 8:53 ` Martin Jansa
10 siblings, 0 replies; 12+ messages in thread
From: Martin Jansa @ 2014-04-20 8:53 UTC (permalink / raw)
To: openembedded-devel
[-- Attachment #1: Type: text/plain, Size: 4589 bytes --]
On Tue, Apr 01, 2014 at 05:21:36PM +0200, Andreas Müller wrote:
> mousepad seems already fixed in secret shr repo
>
> The following changes since commit c04626475be6f0e52400552d5aed044062aac4dd:
>
> exo: Add intltool-native as native dependency (2014-03-29 22:51:36 +0100)
>
> are available in the git repository at:
>
> git://gitorious.org/schnitzeltony-oe-meta/meta-openembedded.git patches-for-world
>
> for you to fetch changes up to 4972401d7133f07f732a06d47bc9bce664465493:
>
> abiword: update to 3.0.0 to fix build (2014-04-01 17:12:30 +0200)
All merged, thanks!
>
> ----------------------------------------------------------------
> Andreas Müller (10):
> xfce-git.bbclass initial add
> xarchiver: fix configue
> xfwm4: fix configue by inheriting xfce-git.bbclass
> libxfce4ui: fix configue by inheriting xfce-git.bbclass
> xfce4-taskmanager: fix configue by inheriting xfce-git.bbclass
> xfce4-closebutton-plugin: fix configue by inheriting xfce-git.bbclass
> xfce4-settings: fix configue by inheriting xfce-git.bbclass
> xfce4-dev-tools: update to 4.11.0
> sound-theme-freedesktop: fix configure
> abiword: update to 3.0.0 to fix build
>
> meta-gnome/recipes-gnome/abiword/abiword/abiword-cxx-for-ld-fix.patch | 12 ---------
> meta-gnome/recipes-gnome/abiword/abiword/abiword.fix.glib-2.32.patch | 21 ----------------
> meta-gnome/recipes-gnome/abiword/abiword/cdump.pl | 32 ------------------------
> meta-gnome/recipes-gnome/abiword/abiword/debian_patches_boost54.patch | 32 ++++++++++++++++++++++++
> meta-gnome/recipes-gnome/abiword/abiword/fix.no.undefined.param.patch | 104 ----------------------------------------------------------------------------
> meta-gnome/recipes-gnome/abiword/abiword/libpng15.patch | 102 --------------------------------------------------------------------------
> meta-gnome/recipes-gnome/abiword/abiword/nodolt.patch | 12 ---------
> meta-gnome/recipes-gnome/abiword/{abiword_2.8.6.bb => abiword_3.0.0.bb} | 39 +++++++++++------------------
> meta-oe/recipes-multimedia/sound-themes/sound-theme-freedesktop_0.8.bb | 2 ++
> meta-xfce/classes/xfce-git.bbclass | 5 ++++
> meta-xfce/recipes-apps/xarchiver/xarchiver_git.bb | 8 ++----
> meta-xfce/recipes-apps/xfce4-taskmanager/xfce4-taskmanager_git.bb | 6 +----
> meta-xfce/recipes-panel-plugins/closebutton/xfce4-closebutton-plugin_git.bb | 6 +----
> meta-xfce/recipes-xfce/libxfce4ui/libxfce4ui_4.10.0.bb | 8 +-----
> meta-xfce/recipes-xfce/xfce4-dev-tools/{xfce4-dev-tools_4.10.0.bb => xfce4-dev-tools_4.11.0.bb} | 4 +--
> meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings_git.bb | 6 +----
> meta-xfce/recipes-xfce/xfwm4/xfwm4_git.bb | 6 +----
> 17 files changed, 63 insertions(+), 342 deletions(-)
> delete mode 100644 meta-gnome/recipes-gnome/abiword/abiword/abiword-cxx-for-ld-fix.patch
> delete mode 100644 meta-gnome/recipes-gnome/abiword/abiword/abiword.fix.glib-2.32.patch
> delete mode 100755 meta-gnome/recipes-gnome/abiword/abiword/cdump.pl
> create mode 100644 meta-gnome/recipes-gnome/abiword/abiword/debian_patches_boost54.patch
> delete mode 100644 meta-gnome/recipes-gnome/abiword/abiword/fix.no.undefined.param.patch
> delete mode 100644 meta-gnome/recipes-gnome/abiword/abiword/libpng15.patch
> delete mode 100644 meta-gnome/recipes-gnome/abiword/abiword/nodolt.patch
> rename meta-gnome/recipes-gnome/abiword/{abiword_2.8.6.bb => abiword_3.0.0.bb} (83%)
> create mode 100644 meta-xfce/classes/xfce-git.bbclass
> rename meta-xfce/recipes-xfce/xfce4-dev-tools/{xfce4-dev-tools_4.10.0.bb => xfce4-dev-tools_4.11.0.bb} (78%)
>
> --
> 1.8.3.1
>
> --
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-devel
--
Martin 'JaMa' Jansa jabber: Martin.Jansa@gmail.com
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 205 bytes --]
^ permalink raw reply [flat|nested] 12+ messages in thread
end of thread, other threads:[~2014-04-20 8:53 UTC | newest]
Thread overview: 12+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-04-01 15:21 [PATCH][meta-xfce/meta-gnome 00/10] world-fixes Andreas Müller
2014-04-01 15:21 ` [PATCH][meta-xfce/meta-gnome 01/10] xfce-git.bbclass initial add Andreas Müller
2014-04-01 15:21 ` [PATCH][meta-xfce/meta-gnome 02/10] xarchiver: fix configue Andreas Müller
2014-04-01 15:21 ` [PATCH][meta-xfce/meta-gnome 03/10] xfwm4: fix configue by inheriting xfce-git.bbclass Andreas Müller
2014-04-01 15:21 ` [PATCH][meta-xfce/meta-gnome 04/10] libxfce4ui: " Andreas Müller
2014-04-01 15:21 ` [PATCH][meta-xfce/meta-gnome 05/10] xfce4-taskmanager: " Andreas Müller
2014-04-01 15:21 ` [PATCH][meta-xfce/meta-gnome 06/10] xfce4-closebutton-plugin: " Andreas Müller
2014-04-01 15:21 ` [PATCH][meta-xfce/meta-gnome 07/10] xfce4-settings: " Andreas Müller
2014-04-01 15:21 ` [PATCH][meta-xfce/meta-gnome 08/10] xfce4-dev-tools: update to 4.11.0 Andreas Müller
2014-04-01 15:21 ` [PATCH][meta-xfce/meta-gnome 09/10] sound-theme-freedesktop: fix configure Andreas Müller
2014-04-01 15:21 ` [PATCH][meta-xfce/meta-gnome 10/10] abiword: update to 3.0.0 to fix build Andreas Müller
2014-04-20 8:53 ` [PATCH][meta-xfce/meta-gnome 00/10] world-fixes Martin Jansa
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.