* [meta-gnome][PATCH 02/10] gnome-settings-daemon: remove blacklist, libgnomekbd has been fixed
2014-08-01 13:34 [meta-gnome][PATCH 01/10] libgnomekbd: fix S!=B Koen Kooi
@ 2014-08-01 13:34 ` Koen Kooi
2014-08-01 13:34 ` [meta-gnome][PATCH 03/10] gnome-control-center: " Koen Kooi
` (7 subsequent siblings)
8 siblings, 0 replies; 12+ messages in thread
From: Koen Kooi @ 2014-08-01 13:34 UTC (permalink / raw)
To: openembedded-devel; +Cc: Koen Kooi
Also fix S!=B and dependency issues.
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
---
.../gnome-settings-daemon/gnome-settings-daemon_2.32.1.bb | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/meta-gnome/recipes-gnome/gnome-settings-daemon/gnome-settings-daemon_2.32.1.bb b/meta-gnome/recipes-gnome/gnome-settings-daemon/gnome-settings-daemon_2.32.1.bb
index 2482732..fc7321e 100644
--- a/meta-gnome/recipes-gnome/gnome-settings-daemon/gnome-settings-daemon_2.32.1.bb
+++ b/meta-gnome/recipes-gnome/gnome-settings-daemon/gnome-settings-daemon_2.32.1.bb
@@ -4,9 +4,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552"
PR = "r7"
-PNBLACKLIST[gnome-settings-daemon] = "BROKEN: depends on broken libgnomekbd"
-
-DEPENDS = "libxxf86misc libsndfile1 libxtst glib-2.0 polkit gtk+ gconf dbus-glib libnotify libgnomekbd libxklavier gnome-doc-utils gnome-desktop"
+DEPENDS = "intltool libxxf86misc libsndfile1 libxtst glib-2.0 polkit gtk+ gconf dbus-glib libnotify libgnomekbd libxklavier gnome-doc-utils gnome-desktop"
inherit gnome
@@ -25,7 +23,7 @@ EXTRA_OECONF = "--disable-esd \
"
do_configure_prepend() {
- sed -i -e 's:-L$libdir::g' -e 's:-I$includedir::g' configure.ac
+ sed -i -e 's:-L$libdir::g' -e 's:-I$includedir::g' ${S}/configure.ac
}
FILES_${PN} += "${libdir}/gnome-settings-daemon-2.0/*.so ${libdir}/gnome-settings-daemon-2.0/*plugin \
--
1.9.0
^ permalink raw reply related [flat|nested] 12+ messages in thread* [meta-gnome][PATCH 03/10] gnome-control-center: remove blacklist, libgnomekbd has been fixed
2014-08-01 13:34 [meta-gnome][PATCH 01/10] libgnomekbd: fix S!=B Koen Kooi
2014-08-01 13:34 ` [meta-gnome][PATCH 02/10] gnome-settings-daemon: remove blacklist, libgnomekbd has been fixed Koen Kooi
@ 2014-08-01 13:34 ` Koen Kooi
2014-08-01 13:34 ` [meta-gnome][PATCH 04/10] nautilus: fix S!=B Koen Kooi
` (6 subsequent siblings)
8 siblings, 0 replies; 12+ messages in thread
From: Koen Kooi @ 2014-08-01 13:34 UTC (permalink / raw)
To: openembedded-devel; +Cc: Koen Kooi
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
---
.../recipes-gnome/gnome-control-center/gnome-control-center_2.32.1.bb | 2 --
1 file changed, 2 deletions(-)
diff --git a/meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center_2.32.1.bb b/meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center_2.32.1.bb
index ad0318e..5cc7ad1 100644
--- a/meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center_2.32.1.bb
+++ b/meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center_2.32.1.bb
@@ -2,8 +2,6 @@ SUMMARY = "GNOME control center"
LICENSE = "GPLv2"
LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
-PNBLACKLIST[gnome-control-center] = "BROKEN: depends on broken libgnomekbd"
-
DEPENDS = "desktop-file-utils-native gnome-menus libunique dbus-glib gnome-desktop libxml2 metacity gconf gnome-settings-daemon librsvg pango libgnomekbd libxklavier libcanberra libgtop libxscrnsaver"
PR = "r1"
--
1.9.0
^ permalink raw reply related [flat|nested] 12+ messages in thread* [meta-gnome][PATCH 04/10] nautilus: fix S!=B
2014-08-01 13:34 [meta-gnome][PATCH 01/10] libgnomekbd: fix S!=B Koen Kooi
2014-08-01 13:34 ` [meta-gnome][PATCH 02/10] gnome-settings-daemon: remove blacklist, libgnomekbd has been fixed Koen Kooi
2014-08-01 13:34 ` [meta-gnome][PATCH 03/10] gnome-control-center: " Koen Kooi
@ 2014-08-01 13:34 ` Koen Kooi
2014-08-01 13:34 ` [meta-gnome][PATCH 05/10] libgsf: update to 1.14.29 Koen Kooi
` (5 subsequent siblings)
8 siblings, 0 replies; 12+ messages in thread
From: Koen Kooi @ 2014-08-01 13:34 UTC (permalink / raw)
To: openembedded-devel; +Cc: Koen Kooi
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
---
meta-gnome/recipes-gnome/nautilus/nautilus_2.32.2.bb | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/meta-gnome/recipes-gnome/nautilus/nautilus_2.32.2.bb b/meta-gnome/recipes-gnome/nautilus/nautilus_2.32.2.bb
index f7c7c1e..58a45b1 100644
--- a/meta-gnome/recipes-gnome/nautilus/nautilus_2.32.2.bb
+++ b/meta-gnome/recipes-gnome/nautilus/nautilus_2.32.2.bb
@@ -8,12 +8,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=7c0048536e43642a1f3a724c2909872b \
PR = "r6"
-PNBLACKLIST[nautilus] = "BROKEN: doesn't build with B!=S"
-
DEPENDS = "gdk-pixbuf gtk+ libunique gvfs librsvg libexif esound gnome-desktop orbit2-native"
# optional: tracker
-inherit gnome
+inherit gnome autotools-brokensep
SRC_URI[archive.md5sum] = "51565aa10d1625dff56e381228346911"
SRC_URI[archive.sha256sum] = "2d4ff28c7a7aa5d40eb2468149954a564c257a305183773057584d22d15347a2"
--
1.9.0
^ permalink raw reply related [flat|nested] 12+ messages in thread* [meta-gnome][PATCH 05/10] libgsf: update to 1.14.29
2014-08-01 13:34 [meta-gnome][PATCH 01/10] libgnomekbd: fix S!=B Koen Kooi
` (2 preceding siblings ...)
2014-08-01 13:34 ` [meta-gnome][PATCH 04/10] nautilus: fix S!=B Koen Kooi
@ 2014-08-01 13:34 ` Koen Kooi
2014-08-01 13:34 ` [meta-gnome][PATCH 06/10] wv: update to 1.2.4 Koen Kooi
` (4 subsequent siblings)
8 siblings, 0 replies; 12+ messages in thread
From: Koen Kooi @ 2014-08-01 13:34 UTC (permalink / raw)
To: openembedded-devel; +Cc: Koen Kooi
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
---
.../recipes-gnome/libgsf/{libgsf_1.14.26.bb => libgsf_1.14.29.bb} | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
rename meta-gnome/recipes-gnome/libgsf/{libgsf_1.14.26.bb => libgsf_1.14.29.bb} (68%)
diff --git a/meta-gnome/recipes-gnome/libgsf/libgsf_1.14.26.bb b/meta-gnome/recipes-gnome/libgsf/libgsf_1.14.29.bb
similarity index 68%
rename from meta-gnome/recipes-gnome/libgsf/libgsf_1.14.26.bb
rename to meta-gnome/recipes-gnome/libgsf/libgsf_1.14.29.bb
index 7d7776c..881d19e 100644
--- a/meta-gnome/recipes-gnome/libgsf/libgsf_1.14.26.bb
+++ b/meta-gnome/recipes-gnome/libgsf/libgsf_1.14.29.bb
@@ -7,12 +7,10 @@ SECTION = "libs"
DEPENDS= "libxml2 bzip2 glib-2.0 zlib"
-PNBLACKLIST[libgsf] = "BROKEN: since glib upgrade error: implicit declaration of function 'g_memmove' [-Werror=implicit-function-declaration]"
-
inherit autotools pkgconfig gnome gconf
-SRC_URI[archive.md5sum] = "3c5a4fbd16a727c36974078e6d0e9575"
-SRC_URI[archive.sha256sum] = "8919e725aadd785380350c8dec7427d82cf33164bc9a9a549df9440a0c3da6d5"
+SRC_URI[archive.md5sum] = "3056b94bb3281dbc8311371bfc23cf72"
+SRC_URI[archive.sha256sum] = "4d8bca33424eb711acdb6a060cb488b132063d699c4fa201db24c2c89c62529c"
GNOME_COMPRESS_TYPE = "xz"
--
1.9.0
^ permalink raw reply related [flat|nested] 12+ messages in thread* [meta-gnome][PATCH 06/10] wv: update to 1.2.4
2014-08-01 13:34 [meta-gnome][PATCH 01/10] libgnomekbd: fix S!=B Koen Kooi
` (3 preceding siblings ...)
2014-08-01 13:34 ` [meta-gnome][PATCH 05/10] libgsf: update to 1.14.29 Koen Kooi
@ 2014-08-01 13:34 ` Koen Kooi
2014-08-01 13:34 ` [meta-gnome][PATCH 07/10] abiword: remove blacklist, libgsf and sv have been fixed Koen Kooi
` (3 subsequent siblings)
8 siblings, 0 replies; 12+ messages in thread
From: Koen Kooi @ 2014-08-01 13:34 UTC (permalink / raw)
To: openembedded-devel; +Cc: Koen Kooi
Also fix automake foreign problems.
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
---
...se-foreign-mode-to-avoid-errors-with-miss.patch | 29 ++++++++++++++++++++++
.../wv/{wv-1.2.0 => wv-1.2.4}/pkgconfig.patch | 0
.../recipes-gnome/wv/{wv_1.2.0.bb => wv_1.2.4.bb} | 12 ++++-----
3 files changed, 35 insertions(+), 6 deletions(-)
create mode 100644 meta-gnome/recipes-gnome/wv/wv-1.2.4/0001-configure-use-foreign-mode-to-avoid-errors-with-miss.patch
rename meta-gnome/recipes-gnome/wv/{wv-1.2.0 => wv-1.2.4}/pkgconfig.patch (100%)
rename meta-gnome/recipes-gnome/wv/{wv_1.2.0.bb => wv_1.2.4.bb} (57%)
diff --git a/meta-gnome/recipes-gnome/wv/wv-1.2.4/0001-configure-use-foreign-mode-to-avoid-errors-with-miss.patch b/meta-gnome/recipes-gnome/wv/wv-1.2.4/0001-configure-use-foreign-mode-to-avoid-errors-with-miss.patch
new file mode 100644
index 0000000..a8c5bc7
--- /dev/null
+++ b/meta-gnome/recipes-gnome/wv/wv-1.2.4/0001-configure-use-foreign-mode-to-avoid-errors-with-miss.patch
@@ -0,0 +1,29 @@
+From eebe1f27f4b27b05eb4b9b55f9df1124acf4d092 Mon Sep 17 00:00:00 2001
+From: Koen Kooi <koen@dominion.thruhere.net>
+Date: Fri, 1 Aug 2014 12:25:24 +0200
+Subject: [PATCH] configure: use 'foreign' mode to avoid errors with missing
+ NEWS/AUTHORS/etc
+
+Upstream-status: Pending
+
+Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
+---
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index 3d7eef6..1784bdd 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -41,7 +41,7 @@ VERSION=$WV_VERSION
+ PACKAGE=wv
+
+ dnl Initialize automake stuff
+-AM_INIT_AUTOMAKE($PACKAGE, $VERSION)
++AM_INIT_AUTOMAKE([foreign])
+
+ # Specify a configuration file
+ AM_CONFIG_HEADER(config.h)
+--
+1.9.0
+
diff --git a/meta-gnome/recipes-gnome/wv/wv-1.2.0/pkgconfig.patch b/meta-gnome/recipes-gnome/wv/wv-1.2.4/pkgconfig.patch
similarity index 100%
rename from meta-gnome/recipes-gnome/wv/wv-1.2.0/pkgconfig.patch
rename to meta-gnome/recipes-gnome/wv/wv-1.2.4/pkgconfig.patch
diff --git a/meta-gnome/recipes-gnome/wv/wv_1.2.0.bb b/meta-gnome/recipes-gnome/wv/wv_1.2.4.bb
similarity index 57%
rename from meta-gnome/recipes-gnome/wv/wv_1.2.0.bb
rename to meta-gnome/recipes-gnome/wv/wv_1.2.4.bb
index c125696..6489c6f 100644
--- a/meta-gnome/recipes-gnome/wv/wv_1.2.0.bb
+++ b/meta-gnome/recipes-gnome/wv/wv_1.2.4.bb
@@ -3,15 +3,15 @@ HOMEPAGE = "http://wvware.sourceforge.net/"
LICENSE = "GPLv2"
LIC_FILES_CHKSUM = "file://COPYING;md5=6cbca01f1c9178aca280e8ff64d85b2f"
-PNBLACKLIST[wv] = "BROKEN: depends on broken libgsf"
-
DEPENDS = "libgsf glib-2.0 libpng"
-PR = "r5"
SRC_URI = "${SOURCEFORGE_MIRROR}/wvware/wv-${PV}.tar.gz \
- file://pkgconfig.patch"
-SRC_URI[md5sum] = "b6319d5e75611fe2210453b5feb82c0c"
-SRC_URI[sha256sum] = "a76f44468e78591e6d510d326702e7c3999d2b9dd3ab8ab8c1c9811fd5b111e4"
+ file://pkgconfig.patch \
+ file://0001-configure-use-foreign-mode-to-avoid-errors-with-miss.patch \
+ "
+
+SRC_URI[md5sum] = "c1861c560491f121e12917fa76970ac5"
+SRC_URI[sha256sum] = "673109910e22d4cf94cc8be4dcb9a0c41b5fbdb1736d4b7bdc7778894d57c2d6"
inherit autotools pkgconfig
--
1.9.0
^ permalink raw reply related [flat|nested] 12+ messages in thread* [meta-gnome][PATCH 07/10] abiword: remove blacklist, libgsf and sv have been fixed
2014-08-01 13:34 [meta-gnome][PATCH 01/10] libgnomekbd: fix S!=B Koen Kooi
` (4 preceding siblings ...)
2014-08-01 13:34 ` [meta-gnome][PATCH 06/10] wv: update to 1.2.4 Koen Kooi
@ 2014-08-01 13:34 ` Koen Kooi
2014-08-04 16:14 ` Martin Jansa
2014-08-01 13:34 ` [meta-gnome][PATCH 08/10] goffice: remove blacklist. libgsf has " Koen Kooi
` (2 subsequent siblings)
8 siblings, 1 reply; 12+ messages in thread
From: Koen Kooi @ 2014-08-01 13:34 UTC (permalink / raw)
To: openembedded-devel; +Cc: Koen Kooi
Also disable collab service due to gnutls build errors.
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
---
meta-gnome/recipes-gnome/abiword/abiword_3.0.0.bb | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/meta-gnome/recipes-gnome/abiword/abiword_3.0.0.bb b/meta-gnome/recipes-gnome/abiword/abiword_3.0.0.bb
index 7cd6c65..eb4bba2 100644
--- a/meta-gnome/recipes-gnome/abiword/abiword_3.0.0.bb
+++ b/meta-gnome/recipes-gnome/abiword/abiword_3.0.0.bb
@@ -14,8 +14,6 @@ SRC_URI = "http://www.abisource.com/downloads/${BPN}/${PV}/source/${BP}.tar.gz \
file://autogen-common.sh \
"
-PNBLACKLIST[abiword] = "BROKEN: depends on broken wv -> libgsf"
-
LIC_FILES_CHKSUM = "file://COPYING;md5=c5edcc3ccd864b19004d14e9c1c9a26a"
SRC_URI[md5sum] = "8d9c41cff3a8fbef8d0c835c65600e65"
@@ -26,7 +24,7 @@ SHRT_VER = "${@d.getVar('PV',1).split('.')[0]}.${@d.getVar('PV',1).split('.')[1]
inherit autotools-brokensep pkgconfig
-PACKAGECONFIG ??= "collab-backend-xmpp collab-backend-tcp collab-backend-service"
+PACKAGECONFIG ??= "collab-backend-xmpp collab-backend-tcp"
PACKAGECONFIG[spell] = "--enable-spell,--disable-spell,enchant"
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"
--
1.9.0
^ permalink raw reply related [flat|nested] 12+ messages in thread* Re: [meta-gnome][PATCH 07/10] abiword: remove blacklist, libgsf and sv have been fixed
2014-08-01 13:34 ` [meta-gnome][PATCH 07/10] abiword: remove blacklist, libgsf and sv have been fixed Koen Kooi
@ 2014-08-04 16:14 ` Martin Jansa
2014-08-06 12:56 ` Koen Kooi
0 siblings, 1 reply; 12+ messages in thread
From: Martin Jansa @ 2014-08-04 16:14 UTC (permalink / raw)
To: openembedded-devel; +Cc: Koen Kooi
[-- Attachment #1: Type: text/plain, Size: 2878 bytes --]
On Fri, Aug 01, 2014 at 03:34:53PM +0200, Koen Kooi wrote:
> Also disable collab service due to gnutls build errors.
abiword also depends on libwmf-native which is still broken
| checking for XML_ParserFree in -lexpat... yes
| checking for freetype-config... /home/jenkins/oe/world/shr-core/tmp-eglibc/sysroots/x86_64-linux/usr/bin/freetype-config
| checking for FT_Init_FreeType in -lfreetype... yes
| checking ft2build.h usability... no
| checking ft2build.h presence... no
| checking for ft2build.h... no
| configure: error: * * * freetype(2) is required * * *
| Configure failed. The contents of all config.log files follows to aid debugging
| ERROR: oe_runconf failed
| WARNING: exit code 1 from a shell command.
| ERROR: Function failed: do_configure (log file is located at /home/jenkins/oe/world/shr-core/tmp-eglibc/work/x86_64-linux/libwmf-native/0.2.8.4-r3/temp/log.do_configure.22003)
NOTE: recipe libwmf-native-0.2.8.4-r3: task do_configure: Failed
ERROR: Task 28608 (virtual:native:/home/jenkins/oe/world/shr-core/meta-openembedded/meta-oe/recipes-extended/libwmf/libwmf_0.2.8.4.bb, do_configure) failed with exit code '1'
> Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
> ---
> meta-gnome/recipes-gnome/abiword/abiword_3.0.0.bb | 4 +---
> 1 file changed, 1 insertion(+), 3 deletions(-)
>
> diff --git a/meta-gnome/recipes-gnome/abiword/abiword_3.0.0.bb b/meta-gnome/recipes-gnome/abiword/abiword_3.0.0.bb
> index 7cd6c65..eb4bba2 100644
> --- a/meta-gnome/recipes-gnome/abiword/abiword_3.0.0.bb
> +++ b/meta-gnome/recipes-gnome/abiword/abiword_3.0.0.bb
> @@ -14,8 +14,6 @@ SRC_URI = "http://www.abisource.com/downloads/${BPN}/${PV}/source/${BP}.tar.gz \
> file://autogen-common.sh \
> "
>
> -PNBLACKLIST[abiword] = "BROKEN: depends on broken wv -> libgsf"
> -
> LIC_FILES_CHKSUM = "file://COPYING;md5=c5edcc3ccd864b19004d14e9c1c9a26a"
>
> SRC_URI[md5sum] = "8d9c41cff3a8fbef8d0c835c65600e65"
> @@ -26,7 +24,7 @@ SHRT_VER = "${@d.getVar('PV',1).split('.')[0]}.${@d.getVar('PV',1).split('.')[1]
>
> inherit autotools-brokensep pkgconfig
>
> -PACKAGECONFIG ??= "collab-backend-xmpp collab-backend-tcp collab-backend-service"
> +PACKAGECONFIG ??= "collab-backend-xmpp collab-backend-tcp"
> PACKAGECONFIG[spell] = "--enable-spell,--disable-spell,enchant"
> 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"
> --
> 1.9.0
>
> --
> _______________________________________________
> 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: 188 bytes --]
^ permalink raw reply [flat|nested] 12+ messages in thread* Re: [meta-gnome][PATCH 07/10] abiword: remove blacklist, libgsf and sv have been fixed
2014-08-04 16:14 ` Martin Jansa
@ 2014-08-06 12:56 ` Koen Kooi
0 siblings, 0 replies; 12+ messages in thread
From: Koen Kooi @ 2014-08-06 12:56 UTC (permalink / raw)
To: Martin Jansa; +Cc: openembedded-devel
Op 4 aug. 2014, om 18:14 heeft Martin Jansa <martin.jansa@gmail.com> het volgende geschreven:
> On Fri, Aug 01, 2014 at 03:34:53PM +0200, Koen Kooi wrote:
>> Also disable collab service due to gnutls build errors.
>
> abiword also depends on libwmf-native which is still broken
>
> | checking for XML_ParserFree in -lexpat... yes
> | checking for freetype-config... /home/jenkins/oe/world/shr-core/tmp-eglibc/sysroots/x86_64-linux/usr/bin/freetype-config
> | checking for FT_Init_FreeType in -lfreetype... yes
> | checking ft2build.h usability... no
> | checking ft2build.h presence... no
> | checking for ft2build.h... no
> | configure: error: * * * freetype(2) is required * * *
> | Configure failed. The contents of all config.log files follows to aid debugging
> | ERROR: oe_runconf failed
> | WARNING: exit code 1 from a shell command.
> | ERROR: Function failed: do_configure (log file is located at /home/jenkins/oe/world/shr-core/tmp-eglibc/work/x86_64-linux/libwmf-native/0.2.8.4-r3/temp/log.do_configure.22003)
> NOTE: recipe libwmf-native-0.2.8.4-r3: task do_configure: Failed
> ERROR: Task 28608 (virtual:native:/home/jenkins/oe/world/shr-core/meta-openembedded/meta-oe/recipes-extended/libwmf/libwmf_0.2.8.4.bb, do_configure) failed with exit code '1'
Patch sent: http://patches.openembedded.org/patch/77381/
>
>> Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
>> ---
>> meta-gnome/recipes-gnome/abiword/abiword_3.0.0.bb | 4 +---
>> 1 file changed, 1 insertion(+), 3 deletions(-)
>>
>> diff --git a/meta-gnome/recipes-gnome/abiword/abiword_3.0.0.bb b/meta-gnome/recipes-gnome/abiword/abiword_3.0.0.bb
>> index 7cd6c65..eb4bba2 100644
>> --- a/meta-gnome/recipes-gnome/abiword/abiword_3.0.0.bb
>> +++ b/meta-gnome/recipes-gnome/abiword/abiword_3.0.0.bb
>> @@ -14,8 +14,6 @@ SRC_URI = "http://www.abisource.com/downloads/${BPN}/${PV}/source/${BP}.tar.gz \
>> file://autogen-common.sh \
>> "
>>
>> -PNBLACKLIST[abiword] = "BROKEN: depends on broken wv -> libgsf"
>> -
>> LIC_FILES_CHKSUM = "file://COPYING;md5=c5edcc3ccd864b19004d14e9c1c9a26a"
>>
>> SRC_URI[md5sum] = "8d9c41cff3a8fbef8d0c835c65600e65"
>> @@ -26,7 +24,7 @@ SHRT_VER = "${@d.getVar('PV',1).split('.')[0]}.${@d.getVar('PV',1).split('.')[1]
>>
>> inherit autotools-brokensep pkgconfig
>>
>> -PACKAGECONFIG ??= "collab-backend-xmpp collab-backend-tcp collab-backend-service"
>> +PACKAGECONFIG ??= "collab-backend-xmpp collab-backend-tcp"
>> PACKAGECONFIG[spell] = "--enable-spell,--disable-spell,enchant"
>> 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"
>> --
>> 1.9.0
>>
>> --
>> _______________________________________________
>> 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
^ permalink raw reply [flat|nested] 12+ messages in thread
* [meta-gnome][PATCH 08/10] goffice: remove blacklist. libgsf has been fixed
2014-08-01 13:34 [meta-gnome][PATCH 01/10] libgnomekbd: fix S!=B Koen Kooi
` (5 preceding siblings ...)
2014-08-01 13:34 ` [meta-gnome][PATCH 07/10] abiword: remove blacklist, libgsf and sv have been fixed Koen Kooi
@ 2014-08-01 13:34 ` Koen Kooi
2014-08-01 13:34 ` [meta-gnome][PATCH 09/10] gnumeric: " Koen Kooi
2014-08-01 13:34 ` [meta-gnome][PATCH 10/10] libgnomeprint: use pkgconfig for freetype support Koen Kooi
8 siblings, 0 replies; 12+ messages in thread
From: Koen Kooi @ 2014-08-01 13:34 UTC (permalink / raw)
To: openembedded-devel; +Cc: Koen Kooi
Also add missing dependency on intltool.
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
---
meta-gnome/recipes-support/goffice/goffice_0.10.1.bb | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/meta-gnome/recipes-support/goffice/goffice_0.10.1.bb b/meta-gnome/recipes-support/goffice/goffice_0.10.1.bb
index b64119d..1e9ec4c 100644
--- a/meta-gnome/recipes-support/goffice/goffice_0.10.1.bb
+++ b/meta-gnome/recipes-support/goffice/goffice_0.10.1.bb
@@ -3,9 +3,7 @@ DESCRIPTION="Gnome Office Library"
LICENSE="GPLv2"
LIC_FILES_CHKSUM = "file://COPYING;md5=6dc33ff21e1ba1ac1a2a1069d361e29e"
-PNBLACKLIST[goffice] = "BROKEN: depends on broken libgsf"
-
-DEPENDS = "libxml-parser-perl-native glib-2.0 gtk+3 pango cairo libgsf libpcre libxml2 libart-lgpl librsvg"
+DEPENDS = "libxml-parser-perl-native glib-2.0 gtk+3 pango cairo libgsf libpcre libxml2 libart-lgpl librsvg intltool"
inherit gnomebase pkgconfig perlnative
--
1.9.0
^ permalink raw reply related [flat|nested] 12+ messages in thread* [meta-gnome][PATCH 09/10] gnumeric: remove blacklist. libgsf has been fixed
2014-08-01 13:34 [meta-gnome][PATCH 01/10] libgnomekbd: fix S!=B Koen Kooi
` (6 preceding siblings ...)
2014-08-01 13:34 ` [meta-gnome][PATCH 08/10] goffice: remove blacklist. libgsf has " Koen Kooi
@ 2014-08-01 13:34 ` Koen Kooi
2014-08-01 13:34 ` [meta-gnome][PATCH 10/10] libgnomeprint: use pkgconfig for freetype support Koen Kooi
8 siblings, 0 replies; 12+ messages in thread
From: Koen Kooi @ 2014-08-01 13:34 UTC (permalink / raw)
To: openembedded-devel; +Cc: Koen Kooi
Also fix S!=B issue.
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
---
meta-gnome/recipes-gnome/gnumeric/gnumeric_1.12.0.bb | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/meta-gnome/recipes-gnome/gnumeric/gnumeric_1.12.0.bb b/meta-gnome/recipes-gnome/gnumeric/gnumeric_1.12.0.bb
index 955148d..71f99ca 100644
--- a/meta-gnome/recipes-gnome/gnumeric/gnumeric_1.12.0.bb
+++ b/meta-gnome/recipes-gnome/gnumeric/gnumeric_1.12.0.bb
@@ -5,8 +5,6 @@ S = "${WORKDIR}/gnumeric-${PV}"
DEPENDS = "gdk-pixbuf libgsf gtk+3 libxml2 libglade libart-lgpl intltool-native libgnomecanvas libgnomeprint libbonoboui orbit2-native goffice"
SUMMARY = "Gnumeric spreadsheet for GNOME"
-PNBLACKLIST[gnumeric] = "BROKEN: depends on broken libgsf"
-
GNOME_COMPRESS_TYPE = "xz"
inherit gnome
@@ -33,7 +31,7 @@ FILES_gnumeric-goffice = "${libdir}/goffice/*/plugins/gnumeric/*"
# This hack works around the problem mentioned here:
# https://mail.gnome.org/archives/gnumeric-list/2010-February/msg00006.html
do_install_prepend() {
- sed -i ${S}/doc/C/Makefile -e 's/\tfor file in $(omffile); do/\t-for file in $(omffile); do/'
+ sed -i ${B}/doc/C/Makefile -e 's/\tfor file in $(omffile); do/\t-for file in $(omffile); do/'
}
python populate_packages_prepend () {
--
1.9.0
^ permalink raw reply related [flat|nested] 12+ messages in thread* [meta-gnome][PATCH 10/10] libgnomeprint: use pkgconfig for freetype support
2014-08-01 13:34 [meta-gnome][PATCH 01/10] libgnomekbd: fix S!=B Koen Kooi
` (7 preceding siblings ...)
2014-08-01 13:34 ` [meta-gnome][PATCH 09/10] gnumeric: " Koen Kooi
@ 2014-08-01 13:34 ` Koen Kooi
8 siblings, 0 replies; 12+ messages in thread
From: Koen Kooi @ 2014-08-01 13:34 UTC (permalink / raw)
To: openembedded-devel; +Cc: Koen Kooi
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
---
...0001-configure-use-pkgconfig-for-freetype.patch | 37 ++++++++++++++++++++++
.../recipes-gnome/gnome/libgnomeprint_2.18.8.bb | 5 +--
2 files changed, 38 insertions(+), 4 deletions(-)
create mode 100644 meta-gnome/recipes-gnome/gnome/libgnomeprint/0001-configure-use-pkgconfig-for-freetype.patch
diff --git a/meta-gnome/recipes-gnome/gnome/libgnomeprint/0001-configure-use-pkgconfig-for-freetype.patch b/meta-gnome/recipes-gnome/gnome/libgnomeprint/0001-configure-use-pkgconfig-for-freetype.patch
new file mode 100644
index 0000000..174985a
--- /dev/null
+++ b/meta-gnome/recipes-gnome/gnome/libgnomeprint/0001-configure-use-pkgconfig-for-freetype.patch
@@ -0,0 +1,37 @@
+From ed31fd89f4c77d89390774d29427898a85b25ab1 Mon Sep 17 00:00:00 2001
+From: Koen Kooi <koen@dominion.thruhere.net>
+Date: Fri, 1 Aug 2014 13:58:36 +0200
+Subject: [PATCH] configure: use pkgconfig for freetype
+
+Upstream-status: Pending
+Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
+---
+ configure.in | 12 +++++-------
+ 1 file changed, 5 insertions(+), 7 deletions(-)
+
+diff --git a/configure.in b/configure.in
+index 729278d..e569429 100644
+--- a/configure.in
++++ b/configure.in
+@@ -164,13 +164,11 @@ dnl Checking for freetype2
+ dnl =================================
+ FREETYPE_LIBS=
+ FREETYPE_CFLAGS=
+-AC_PATH_PROG(FREETYPE_CONFIG, freetype-config, no)
+-if test "x$FREETYPE_CONFIG" = "xno" ; then
+- AC_MSG_ERROR(You need FreeType2 (freetype-devel v 2.x package) for this version of libgnomeprint)
+-else
+- FREETYPE_CFLAGS=`$FREETYPE_CONFIG --cflags`
+- FREETYPE_LIBS=`$FREETYPE_CONFIG --libs`
+-fi
++PKG_CHECK_MODULES(FREETYPE2, freetype2,
++ FREETYPE_CFLAGS="$CFLAGS $FREETYPE2_CFLAGS"
++ FREETYPE_LIBS="$LIBS $FREETYPE2_LIBS",
++ AC_MSG_ERROR([*** Unable to find FreeType2 library (http://www.freetype.org/)])
++)
+
+ libgnomeprint_save_ldflags=$LDFLAGS
+ LDFLAGS="$LDFLAGS $FREETYPE_LIBS"
+--
+1.9.0
+
diff --git a/meta-gnome/recipes-gnome/gnome/libgnomeprint_2.18.8.bb b/meta-gnome/recipes-gnome/gnome/libgnomeprint_2.18.8.bb
index c5fd152..15e513a 100644
--- a/meta-gnome/recipes-gnome/gnome/libgnomeprint_2.18.8.bb
+++ b/meta-gnome/recipes-gnome/gnome/libgnomeprint_2.18.8.bb
@@ -1,10 +1,6 @@
LICENSE = "GPLv2"
SECTION = "x11/gnome/libs"
-# | checking for freetype-config... no
-# | configure: error: You need FreeType2 (freetype-devel v 2.x package) for this version of libgnomeprint
-PNBLACKLIST[libgnomeprint] = "Broken without freetype-config"
-
DEPENDS = "libxml2 libgnomecups glib-2.0 pango libart-lgpl fontconfig popt gnome-common freetype"
LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
@@ -13,6 +9,7 @@ inherit pkgconfig gnomebase
SRC_URI += "file://fix.includes.patch \
file://freetype.patch \
+ file://0001-configure-use-pkgconfig-for-freetype.patch \
"
SRC_URI[archive.md5sum] = "63b05ffb5386e131487c6af30f4c56ac"
SRC_URI[archive.sha256sum] = "1034ec8651051f84d2424e7a1da61c530422cc20ce5b2d9e107e1e46778d9691"
--
1.9.0
^ permalink raw reply related [flat|nested] 12+ messages in thread