From 16e72dfcf3654b312675f01edcd129f72908dfd4 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Sun, 29 Apr 2012 21:28:10 +0200 Subject: [PATCH 01/10] midori: upgrade to 0.4.5 Signed-off-by: Martin Jansa --- .../midori/{midori_0.4.4.bb => midori_0.4.5.bb} | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) rename meta-oe/recipes-connectivity/midori/{midori_0.4.4.bb => midori_0.4.5.bb} (89%) diff --git a/meta-oe/recipes-connectivity/midori/midori_0.4.4.bb b/meta-oe/recipes-connectivity/midori/midori_0.4.5.bb similarity index 89% rename from meta-oe/recipes-connectivity/midori/midori_0.4.4.bb rename to meta-oe/recipes-connectivity/midori/midori_0.4.5.bb index a408d73695..4cdd82d980 100644 --- a/meta-oe/recipes-connectivity/midori/midori_0.4.4.bb +++ b/meta-oe/recipes-connectivity/midori/midori_0.4.5.bb @@ -4,12 +4,10 @@ LICENSE = "LGPLv2.1" LIC_FILES_CHKSUM = "file://COPYING;md5=fbc093901857fcd118f065f900982c24" DEPENDS = "webkit-gtk libsoup-2.4 libsexy openssl vala-native python-native python-docutils-native librsvg-native" -PR = "r1" - SRC_URI = "http://archive.xfce.org/src/apps/midori/0.4/midori-${PV}.tar.bz2;name=midori \ " -SRC_URI[midori.md5sum] = "a6578ebfd237c0f22cce49113b95f70c" -SRC_URI[midori.sha256sum] = "fadd43f76c1c9f6a16483e60a804e58fb6817c6a595b1acdd59bcbdd7b35bca2" +SRC_URI[midori.md5sum] = "14288197a1e2251b7c0803e1448daa0e" +SRC_URI[midori.sha256sum] = "7b57cf3ebb56eef586351f2ae9f71ec9683aedff0b79a071b70b811d9876ff84" inherit gtk-icon-cache pkgconfig From 67f9414daf6b33b429fdc12d355c56e2369cd2c5 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Mon, 30 Apr 2012 07:52:24 +0200 Subject: [PATCH 02/10] libgpewidget: fix build with glib-2.32 * SRC_URI needs to be after inherit gpe and pkgconfig.patch wasn't ever used Signed-off-by: Martin Jansa --- .../libgpewidget/libgpewidget/glib-2.32.patch | 11 +++++++++++ .../libgpewidget/libgpewidget_0.117.bb | 10 ++++++---- 2 files changed, 17 insertions(+), 4 deletions(-) create mode 100644 meta-gpe/recipes-graphics/libgpewidget/libgpewidget/glib-2.32.patch diff --git a/meta-gpe/recipes-graphics/libgpewidget/libgpewidget/glib-2.32.patch b/meta-gpe/recipes-graphics/libgpewidget/libgpewidget/glib-2.32.patch new file mode 100644 index 0000000000..f590caa46d --- /dev/null +++ b/meta-gpe/recipes-graphics/libgpewidget/libgpewidget/glib-2.32.patch @@ -0,0 +1,11 @@ +diff -uNr libgpewidget-0.117.orig/gpehelp.c libgpewidget-0.117/gpehelp.c +--- libgpewidget-0.117.orig/gpehelp.c 2006-10-12 12:20:33.000000000 +0200 ++++ libgpewidget-0.117/gpehelp.c 2012-04-30 07:45:57.813293792 +0200 +@@ -33,7 +33,6 @@ + #include + #include + #include +-#include + + + /* helper function definitions*/ diff --git a/meta-gpe/recipes-graphics/libgpewidget/libgpewidget_0.117.bb b/meta-gpe/recipes-graphics/libgpewidget/libgpewidget_0.117.bb index c4497de285..e8abc43e74 100644 --- a/meta-gpe/recipes-graphics/libgpewidget/libgpewidget_0.117.bb +++ b/meta-gpe/recipes-graphics/libgpewidget/libgpewidget_0.117.bb @@ -5,16 +5,18 @@ LICENSE = "LGPLv2.1" LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=d8045f3b8f929c1cb29a1e3fd737b499" DEPENDS = "gtk+ cairo libxinerama libxcomposite libxrender gtk-doc" -PR = "r1" +PR = "r2" -SRC_URI += "file://pkgconfig.patch;striplevel=0" +inherit gpe pkgconfig autotools + +SRC_URI += "file://pkgconfig.patch;striplevel=0 \ + file://glib-2.32.patch \ +" SRC_URI[md5sum] = "b85a839264a35d0faf9a1a38c486e189" SRC_URI[sha256sum] = "f96d30c09b0395ea4e146730fd52d9ea303b619bb139051d9f12d3f868a9e18c" GPE_TARBALL_SUFFIX = "bz2" -inherit gpe pkgconfig autotools - EXTRA_OECONF = "--enable-cairo" LDFLAGS += " -L${STAGING_LIBDIR}" From dd947fb02c9cb2cfaa6ef681210a42ef07fc6f82 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Mon, 30 Apr 2012 07:52:09 +0200 Subject: [PATCH 03/10] epdfview: fix build with glib-2.32 Signed-off-by: Martin Jansa --- meta-efl/recipes-efl/efl/epdfview/glib-2.32.patch | 12 ++++++++++++ meta-efl/recipes-efl/efl/epdfview_0.1.8.bb | 6 ++++-- 2 files changed, 16 insertions(+), 2 deletions(-) create mode 100644 meta-efl/recipes-efl/efl/epdfview/glib-2.32.patch diff --git a/meta-efl/recipes-efl/efl/epdfview/glib-2.32.patch b/meta-efl/recipes-efl/efl/epdfview/glib-2.32.patch new file mode 100644 index 0000000000..e08584c01c --- /dev/null +++ b/meta-efl/recipes-efl/efl/epdfview/glib-2.32.patch @@ -0,0 +1,12 @@ +diff -uNr epdfview-0.1.8.orig/src/gtk/StockIcons.h epdfview-0.1.8/src/gtk/StockIcons.h +--- epdfview-0.1.8.orig/src/gtk/StockIcons.h 2011-05-28 12:24:57.000000000 +0200 ++++ epdfview-0.1.8/src/gtk/StockIcons.h 2012-04-30 07:48:08.528285594 +0200 +@@ -18,8 +18,6 @@ + #if !defined (__STOCK_ICONS_H__) + #define __STOCK_ICONS_H__ + +-#include +- + G_BEGIN_DECLS + + // ePDFView stock icons. diff --git a/meta-efl/recipes-efl/efl/epdfview_0.1.8.bb b/meta-efl/recipes-efl/efl/epdfview_0.1.8.bb index 5f6bbf4e77..c16137e819 100644 --- a/meta-efl/recipes-efl/efl/epdfview_0.1.8.bb +++ b/meta-efl/recipes-efl/efl/epdfview_0.1.8.bb @@ -5,12 +5,14 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552" SECTION = "x11/applications" DEPENDS = "gtk+ poppler" -PR = "r1" +PR = "r2" EXTRA_OECONF += "--without-cups" inherit autotools gettext -SRC_URI = "http://www.emma-soft.com/projects/epdfview/chrome/site/releases/epdfview-${PV}.tar.bz2" +SRC_URI = "http://www.emma-soft.com/projects/${BPN}/chrome/site/releases/${BP}.tar.bz2 \ + file://glib-2.32.patch \ +" SRC_URI[md5sum] = "e50285b01612169b2594fea375f53ae4" SRC_URI[sha256sum] = "948648ae7c9d7b3b408d738bd4f48d87375b1196cae1129d6b846a8de0f2f8f0" From fbf0e66f986497d2bcadc48977b0de705b0dfc9f Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Mon, 30 Apr 2012 07:52:37 +0200 Subject: [PATCH 04/10] tangogps: fix build with glib-2.32 Signed-off-by: Martin Jansa --- .../tangogps/tangogps-0.99.4/glib-2.32.patch | 11 +++++++++++ .../recipes-navigation/tangogps/tangogps_0.99.4.bb | 6 ++++-- 2 files changed, 15 insertions(+), 2 deletions(-) create mode 100644 meta-oe/recipes-navigation/tangogps/tangogps-0.99.4/glib-2.32.patch diff --git a/meta-oe/recipes-navigation/tangogps/tangogps-0.99.4/glib-2.32.patch b/meta-oe/recipes-navigation/tangogps/tangogps-0.99.4/glib-2.32.patch new file mode 100644 index 0000000000..0579455277 --- /dev/null +++ b/meta-oe/recipes-navigation/tangogps/tangogps-0.99.4/glib-2.32.patch @@ -0,0 +1,11 @@ +diff -uNr tangogps-0.99.4.orig/src/map_management.c tangogps-0.99.4/src/map_management.c +--- tangogps-0.99.4.orig/src/map_management.c 2010-06-25 11:40:05.000000000 +0200 ++++ tangogps-0.99.4/src/map_management.c 2012-04-30 07:43:58.551301271 +0200 +@@ -2,7 +2,6 @@ + + #include + #include +-#include + #include + #include + #include diff --git a/meta-oe/recipes-navigation/tangogps/tangogps_0.99.4.bb b/meta-oe/recipes-navigation/tangogps/tangogps_0.99.4.bb index 3a1ea3df2d..5a4231ab1f 100644 --- a/meta-oe/recipes-navigation/tangogps/tangogps_0.99.4.bb +++ b/meta-oe/recipes-navigation/tangogps/tangogps_0.99.4.bb @@ -5,10 +5,12 @@ SECTION = "x11/applications" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552" DEPENDS = "curl gtk+ gconf sqlite3 libexif libsoup-2.4 bluez4" -PR = "r1" +PR = "r2" SRC_URI = "http://www.tangogps.org/downloads/${P}.tar.gz \ - file://remove.unused.header.patch" + file://remove.unused.header.patch \ + file://glib-2.32.patch \ +" SRC_URI[md5sum] = "0f07ede94a21eb84f5e017fa88a1fc3d" SRC_URI[sha256sum] = "660fdf89ef3c379f2fc0c2a9d0c9d3bfa5345835786b72bf9f513ba9ec2c812a" From 328cc40a12cc2e2d70fbfd5c37b6dbf914358bee Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Sun, 29 Apr 2012 23:05:11 +0200 Subject: [PATCH 05/10] webkit-efl: fix build with gcc-4.7 * that patch is backport of http://trac.webkit.org/changeset/113786/trunk/ to our SRCREV Signed-off-by: Martin Jansa --- ...s-P-to-the-preprocessor-when-running.patch | 76 +++++++++++++++++++ meta-efl/recipes-efl/webkit/webkit-efl_svn.bb | 3 +- 2 files changed, 78 insertions(+), 1 deletion(-) create mode 100644 meta-efl/recipes-efl/webkit/webkit-efl/0001-CMake-Do-not-pass-P-to-the-preprocessor-when-running.patch diff --git a/meta-efl/recipes-efl/webkit/webkit-efl/0001-CMake-Do-not-pass-P-to-the-preprocessor-when-running.patch b/meta-efl/recipes-efl/webkit/webkit-efl/0001-CMake-Do-not-pass-P-to-the-preprocessor-when-running.patch new file mode 100644 index 0000000000..dcd3a4672e --- /dev/null +++ b/meta-efl/recipes-efl/webkit/webkit-efl/0001-CMake-Do-not-pass-P-to-the-preprocessor-when-running.patch @@ -0,0 +1,76 @@ +From 3dfc99730b99472d642f19b825fb9794e32a05c4 Mon Sep 17 00:00:00 2001 +From: "rakuco@webkit.org" + +Date: Tue, 10 Apr 2012 22:59:04 +0000 +Subject: [PATCH] [CMake] Do not pass -P to the preprocessor when running + make_names.pl. + https://bugs.webkit.org/show_bug.cgi?id=83225 + +Reviewed by Rob Buis. + +This is necessary to make CMake-based ports build with the +recently-released GCC 4.7.0, whose preprocessor seems to ignore +empty lines when -P is passed to it. Such behavior breaks +make_names.pl (in fact, InFilesParser.pm), which expects an empty +line to separate common and specific sections in .in files. + +A fix for this same problem has been supposedly done in r84123, +but as the CMake-based ports always pass --preprocessor to the +Perl tools the fix never reached us. + +The idea is to define CODE_GENERATOR_PREPROCESSOR_WITH_LINEMARKERS +for (!MSVC && !QNX) and use it in the macros which call +make_names.pl. + +* Source/cmake/OptionsCommon.cmake: +* Source/cmake/WebKitMacros.cmake: + +git-svn-id: http://svn.webkit.org/repository/webkit/trunk@113786 268f45cc-cd09-0410-ab3c-d52691b4dbfc +--- + ChangeLog | 24 ++++++++++++++++++++++++ + Source/cmake/OptionsCommon.cmake | 7 +++++++ + Source/cmake/WebKitMacros.cmake | 2 +- + 3 files changed, 32 insertions(+), 1 deletions(-) + +diff --git a/Source/cmake/OptionsCommon.cmake b/Source/cmake/OptionsCommon.cmake +index 11581e6..37cb4a8 100644 +--- a/Source/cmake/OptionsCommon.cmake ++++ b/Source/cmake/OptionsCommon.cmake +@@ -5,14 +5,21 @@ IF (WTF_OS_UNIX) + ADD_DEFINITIONS(-DXP_UNIX) + ENDIF (WTF_OS_UNIX) + ++# CODE_GENERATOR_PREPROCESSOR_WITH_LINEMARKERS only matters with GCC >= 4.7.0. Since this ++# version, -P does not output empty lines, which currently breaks make_names.pl in ++# WebCore. Investigating whether make_names.pl should be changed instead is left as an exercise to ++# the reader. + IF (MSVC) + # FIXME: Some codegenerators don't support paths with spaces. So use the executable name only. + GET_FILENAME_COMPONENT(CODE_GENERATOR_PREPROCESSOR_EXECUTABLE ${CMAKE_CXX_COMPILER} NAME) + SET(CODE_GENERATOR_PREPROCESSOR "${CODE_GENERATOR_PREPROCESSOR_EXECUTABLE} /nologo /EP") ++ SET(CODE_GENERATOR_PREPROCESSOR_WITH_LINEMARKERS "${CODE_GENERATOR_PREPROCESSOR}") + ELSEIF (CMAKE_SYSTEM_NAME MATCHES QNX) + SET(CODE_GENERATOR_PREPROCESSOR "${CMAKE_CXX_COMPILER} -E -Wp,-P -x c++") ++ SET(CODE_GENERATOR_PREPROCESSOR_WITH_LINEMARKERS "${CODE_GENERATOR_PREPROCESSOR}") + ELSE () + SET(CODE_GENERATOR_PREPROCESSOR "${CMAKE_CXX_COMPILER} -E -P -x c++") ++ SET(CODE_GENERATOR_PREPROCESSOR_WITH_LINEMARKERS "${CMAKE_CXX_COMPILER} -E -x c++") + ENDIF () + + SET_PROPERTY(GLOBAL PROPERTY USE_FOLDERS ON) +diff --git a/Source/cmake/WebKitMacros.cmake b/Source/cmake/WebKitMacros.cmake +index 3abe342..4e7ca9f 100644 +--- a/Source/cmake/WebKitMacros.cmake ++++ b/Source/cmake/WebKitMacros.cmake +@@ -89,7 +89,7 @@ MACRO (GENERATE_DOM_NAMES _namespace _attrs) + ADD_CUSTOM_COMMAND( + OUTPUT ${_outputfiles} + DEPENDS ${NAMES_GENERATOR} ${SCRIPTS_BINDINGS} ${_attrs} ${_tags} +- COMMAND ${PERL_EXECUTABLE} -I${WEBCORE_DIR}/bindings/scripts ${NAMES_GENERATOR} --preprocessor "${CODE_GENERATOR_PREPROCESSOR}" --outputDir ${DERIVED_SOURCES_WEBCORE_DIR} ${_arguments} ${_additionArguments} ++ COMMAND ${PERL_EXECUTABLE} -I${WEBCORE_DIR}/bindings/scripts ${NAMES_GENERATOR} --preprocessor "${CODE_GENERATOR_PREPROCESSOR_WITH_LINEMARKERS}" --outputDir ${DERIVED_SOURCES_WEBCORE_DIR} ${_arguments} ${_additionArguments} + VERBATIM) + ENDMACRO () + +-- +1.7.7 + diff --git a/meta-efl/recipes-efl/webkit/webkit-efl_svn.bb b/meta-efl/recipes-efl/webkit/webkit-efl_svn.bb index c0e346ce0e..cd3809654a 100644 --- a/meta-efl/recipes-efl/webkit/webkit-efl_svn.bb +++ b/meta-efl/recipes-efl/webkit/webkit-efl_svn.bb @@ -11,7 +11,7 @@ DEPENDS = "icu libxslt sqlite3 gperf-native bison-native flex-native jpeg \ SRCREV = "105069" PV = "1.7.3+svnr${SRCPV}" -PR = "r1" +PR = "r2" SRCREV_FORMAT = "source" @@ -20,6 +20,7 @@ SRC_URI = "\ svn://svn.webkit.org/repository/webkit/trunk/;module=WebKitLibraries;proto=http;subdir=src \ svn://svn.webkit.org/repository/webkit/trunk/;module=Tools;proto=http;subdir=src \ file://0001-JavaScriptCore-add-EINA_LIBRARIES-to-shell-build-for.patch \ + file://0001-CMake-Do-not-pass-P-to-the-preprocessor-when-running.patch \ file://CMakeLists.txt \ " From 0c78b561ef136078b1090c9d2f38f033b90ad8b4 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Mon, 30 Apr 2012 11:54:33 +0200 Subject: [PATCH 06/10] gtkmathview: fix build with gcc-4.7 Signed-off-by: Martin Jansa --- .../gtkmathview/mathview-gcc47x.diff | 48 +++++++++++++++++++ .../mml-widget/gtkmathview_0.8.0.bb | 3 +- 2 files changed, 50 insertions(+), 1 deletion(-) create mode 100644 meta-oe/recipes-extended/mml-widget/gtkmathview/mathview-gcc47x.diff diff --git a/meta-oe/recipes-extended/mml-widget/gtkmathview/mathview-gcc47x.diff b/meta-oe/recipes-extended/mml-widget/gtkmathview/mathview-gcc47x.diff new file mode 100644 index 0000000000..11b7260045 --- /dev/null +++ b/meta-oe/recipes-extended/mml-widget/gtkmathview/mathview-gcc47x.diff @@ -0,0 +1,48 @@ +../../../src/frontend/common/TemplateBuilder.hh:50:113: warning: 'linkerAssoc' was not declared in this scope, and no declarations were found by argument-dependent lookup at the point of instantiation [-fpermissive] +../../../src/frontend/common/TemplateBuilder.hh:50:113: note: declarations in dependent base 'custom_reader_Builder' are not found by unqualified lookup +../../../src/frontend/common/TemplateBuilder.hh:50:113: note: use 'this->linkerAssoc' instead +../../../src/frontend/common/TemplateBuilder.hh:54:111: error: redeclaration of 'SmartPtr elem' +../../../src/frontend/common/TemplateBuilder.hh:50:49: error: 'SmartPtr elem' previously declared here +../../../src/frontend/common/TemplateBuilder.hh:55:2: warning: 'linkerAdd' was not declared in this scope, and no declarations were found by argument-dependent lookup at the point of instantiation [-fpermissive] +../../../src/frontend/common/TemplateBuilder.hh:55:2: note: declarations in dependent base 'custom_reader_Builder' are not found by unqualified lookup +../../../src/frontend/common/TemplateBuilder.hh:55:2: note: use 'this->linkerAdd' instead + +--- gtkmathview-0.8.0.orig/src/frontend/common/TemplateBuilder.hh 2007-08-17 12:02:34.000000000 +0200 ++++ gtkmathview-0.8.0/src/frontend/common/TemplateBuilder.hh 2012-04-30 11:45:07.000000000 +0200 +@@ -47,12 +47,13 @@ + SmartPtr + getElement(const typename Model::Element& el) const + { +- if (SmartPtr elem = smart_cast(linkerAssoc(el))) ++ SmartPtr elem = NULL; ++ if (elem = smart_cast(this->linkerAssoc(el))) + return elem; + else + { +- SmartPtr elem = ElementBuilder::type::create(ElementBuilder::getContext(*this)); +- linkerAdd(el, elem); ++ elem = ElementBuilder::type::create(ElementBuilder::getContext(*this)); ++ this->linkerAdd(el, elem); + return elem; + } + } +--- gtkmathview-0.8.0.orig/mathmlsvg/main.cc 2012-04-30 11:35:19.000000000 +0200 ++++ gtkmathview-0.8.0/mathmlsvg/main.cc 2012-04-30 11:51:19.000000000 +0200 +@@ -20,6 +20,7 @@ + + #include + #include ++#include + #include + #include + +--- gtkmathview-0.8.0.orig/mathmlps/main.cc 2012-04-30 11:35:19.000000000 +0200 ++++ gtkmathview-0.8.0/mathmlps/main.cc 2012-04-30 11:50:57.000000000 +0200 +@@ -20,6 +20,7 @@ + + #include + #include ++#include + #include + #include + diff --git a/meta-oe/recipes-extended/mml-widget/gtkmathview_0.8.0.bb b/meta-oe/recipes-extended/mml-widget/gtkmathview_0.8.0.bb index c8e611a483..67cb32584d 100644 --- a/meta-oe/recipes-extended/mml-widget/gtkmathview_0.8.0.bb +++ b/meta-oe/recipes-extended/mml-widget/gtkmathview_0.8.0.bb @@ -4,10 +4,11 @@ DEPENDS = "t1lib gtk+ popt libxslt libxml2" LICENSE = "LGPLv3" LIC_FILES_CHKSUM = "file://COPYING;md5=6a6a8e020838b23406c81b19c1d46df6" -PR = "r1" +PR = "r2" SRC_URI = "http://helm.cs.unibo.it/mml-widget/sources/${P}.tar.gz \ file://mathview-gcc43x.diff \ + file://mathview-gcc47x.diff \ " SRC_URI[md5sum] = "b53564e553728d4b69f7d366dfeb5299" SRC_URI[sha256sum] = "1dc30175da6a3c560a7d62d1abe1c2f9829d988e6f1a7c5e766544575c558c43" From 8457644a4164d8dd335af9d81e6c558f5da46182 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Mon, 30 Apr 2012 15:29:52 +0200 Subject: [PATCH 07/10] abiword: fix build with glib-2.32 Signed-off-by: Martin Jansa --- .../abiword/abiword.fix.glib-2.32.patch | 21 +++++++++++++++++++ .../recipes-gnome/abiword/abiword_2.8.6.bb | 5 +++-- 2 files changed, 24 insertions(+), 2 deletions(-) create mode 100644 meta-gnome/recipes-gnome/abiword/abiword/abiword.fix.glib-2.32.patch 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 new file mode 100644 index 0000000000..e466ef6c9a --- /dev/null +++ b/meta-gnome/recipes-gnome/abiword/abiword/abiword.fix.glib-2.32.patch @@ -0,0 +1,21 @@ +--- 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 ++#include + + 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 + #include +-#include + #include + + G_BEGIN_DECLS diff --git a/meta-gnome/recipes-gnome/abiword/abiword_2.8.6.bb b/meta-gnome/recipes-gnome/abiword/abiword_2.8.6.bb index 9c7b19f20f..53a980eaa1 100644 --- a/meta-gnome/recipes-gnome/abiword/abiword_2.8.6.bb +++ b/meta-gnome/recipes-gnome/abiword/abiword_2.8.6.bb @@ -2,12 +2,13 @@ require abiword-2.5.inc DEPENDS += " librsvg loudmouth libwmf-native gtkmathview asio" RCONFLICTS_${PN} = "abiword-embedded" -PR = "r2" +PR = "r3" SRC_URI = "http://www.abisource.com/downloads/abiword/${PV}/source/abiword-${PV}.tar.gz;name=abiword \ file://autogen-common.sh \ file://nodolt.patch \ - file://fix.no.undefined.param.patch" + file://fix.no.undefined.param.patch \ + file://abiword.fix.glib-2.32.patch" LIC_FILES_CHKSUM = "file://COPYING;md5=ecd3ac329fca77e2d0e412bec38e1c20" From dff45fb21c52b615908e9b48e8ffb29207544c83 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Mon, 30 Apr 2012 16:20:13 +0200 Subject: [PATCH 08/10] libav-0.7.4: fix build with gcc-4.7 A cmp instruction with two constants is invalid, therefore 'g' constraint is not correct but must be "rm" instead. Signed-off-by: Martin Jansa --- .../libav/libav-0.7.4/h264_qpel_mmx.patch | 57 +++++++++++++++++++ .../recipes-multimedia/libav/libav_0.7.4.bb | 6 +- 2 files changed, 61 insertions(+), 2 deletions(-) create mode 100644 meta-oe/recipes-multimedia/libav/libav-0.7.4/h264_qpel_mmx.patch diff --git a/meta-oe/recipes-multimedia/libav/libav-0.7.4/h264_qpel_mmx.patch b/meta-oe/recipes-multimedia/libav/libav-0.7.4/h264_qpel_mmx.patch new file mode 100644 index 0000000000..5656c47f48 --- /dev/null +++ b/meta-oe/recipes-multimedia/libav/libav-0.7.4/h264_qpel_mmx.patch @@ -0,0 +1,57 @@ +Backport http://git.videolan.org/?p=ffmpeg.git;a=commitdiff;h=5f654897e325349dacf2546674e0510bb72ecb50;hp=250cebeb3b348c3da71f9972eb500d6005dc01f1 + +Fixes these errors on x86 + +libavcodec/x86/h264_qpel_mmx.c: Assembler messages: +libavcodec/x86/h264_qpel_mmx.c:1294: Error: operand type mismatch for `cmp' +libavcodec/x86/h264_qpel_mmx.c:1294: Error: operand type mismatch for `cmp' +libavcodec/x86/h264_qpel_mmx.c:1298: Error: operand type mismatch for `cmp' +libavcodec/x86/h264_qpel_mmx.c:1298: Error: operand type mismatch for `cmp' +libavcodec/x86/h264_qpel_mmx.c:964: Error: operand type mismatch for `cmp' +libavcodec/x86/h264_qpel_mmx.c:964: Error: operand type mismatch for `cmp' +libavcodec/x86/h264_qpel_mmx.c:964: Error: operand type mismatch for `cmp' +make[5]: *** [libavcodec/x86/dsputil_mmx.o] Error 1 + + +Signed-off-by: Khem Raj +Upstream-status: Backport +Index: b/libavcodec/x86/h264_qpel_mmx.c +=================================================================== +--- a/libavcodec/x86/h264_qpel_mmx.c 2012-03-30 11:39:41.324522051 -0700 ++++ b/libavcodec/x86/h264_qpel_mmx.c 2012-03-30 11:54:08.152564075 -0700 +@@ -398,7 +398,7 @@ + "2: \n\t"\ + \ + : "+a"(src), "+c"(dst)\ +- : "S"((x86_reg)srcStride), "D"((x86_reg)dstStride), "g"(h)\ ++ : "S"((x86_reg)srcStride), "D"((x86_reg)dstStride), "rm"(h)\ + : "memory"\ + );\ + src += 4-(h+5)*srcStride;\ +@@ -446,7 +446,7 @@ + QPEL_H264HV(%%mm3, %%mm4, %%mm5, %%mm0, %%mm1, %%mm2, 15*48)\ + "2: \n\t"\ + : "+a"(src)\ +- : "c"(tmp), "S"((x86_reg)srcStride), "g"(size)\ ++ : "c"(tmp), "S"((x86_reg)srcStride), "rm"(size)\ + : "memory"\ + );\ + tmp += 4;\ +@@ -823,7 +823,7 @@ + "2: \n\t"\ + \ + : "+a"(src), "+c"(dst)\ +- : "S"((x86_reg)srcStride), "D"((x86_reg)dstStride), "g"(h)\ ++ : "S"((x86_reg)srcStride), "D"((x86_reg)dstStride), "rm"(h)\ + : XMM_CLOBBERS("%xmm0", "%xmm1", "%xmm2", "%xmm3", \ + "%xmm4", "%xmm5", "%xmm6", "%xmm7",)\ + "memory"\ +@@ -878,7 +878,7 @@ + QPEL_H264HV_XMM(%%xmm3, %%xmm4, %%xmm5, %%xmm0, %%xmm1, %%xmm2, 15*48) + "2: \n\t" + : "+a"(src) +- : "c"(tmp), "S"((x86_reg)srcStride), "g"(size) ++ : "c"(tmp), "S"((x86_reg)srcStride), "rm"(size) + : XMM_CLOBBERS("%xmm0", "%xmm1", "%xmm2", "%xmm3", + "%xmm4", "%xmm5", "%xmm6", "%xmm7",) + "memory" diff --git a/meta-oe/recipes-multimedia/libav/libav_0.7.4.bb b/meta-oe/recipes-multimedia/libav/libav_0.7.4.bb index c4c01db376..bf077c6b46 100644 --- a/meta-oe/recipes-multimedia/libav/libav_0.7.4.bb +++ b/meta-oe/recipes-multimedia/libav/libav_0.7.4.bb @@ -10,9 +10,11 @@ LIC_FILES_CHKSUM = "file://COPYING.GPLv2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ SRCREV = "d4653e882fee5a2876c3878bc23d26799e3380ad" PV = "0.7.4" -PR = "${INC_PR}.0" +PR = "${INC_PR}.1" -SRC_URI = "git://git.libav.org/libav.git;protocol=git;branch=release/0.7" +SRC_URI = "git://git.libav.org/libav.git;protocol=git;branch=release/0.7 \ + file://h264_qpel_mmx.patch \ +" S = "${WORKDIR}/git" From 80c03da7760eeba509b9b07fe3becbf932eeba59 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Fri, 13 Apr 2012 21:20:20 +0200 Subject: [PATCH 09/10] xorg: remove BBCLASSEXTENDs for gtk+-native they should be in oe-core This reverts commit 1ab99af784f5f1564f28f6afc4718d630b42a606. Signed-off-by: Martin Jansa --- meta-oe/recipes-graphics/xorg-lib/libxcomposite_0.4.3.bbappend | 1 - meta-oe/recipes-graphics/xorg-lib/libxcursor_1.1.13.bbappend | 1 - meta-oe/recipes-graphics/xorg-lib/libxdamage_1.1.3.bbappend | 1 - meta-oe/recipes-graphics/xorg-lib/libxfixes_5.0.bbappend | 1 - meta-oe/recipes-graphics/xorg-lib/libxrandr_1.3.2.bbappend | 1 - .../recipes-graphics/xorg-proto/compositeproto_0.4.2.bbappend | 1 - meta-oe/recipes-graphics/xorg-proto/damageproto_1.2.1.bbappend | 1 - meta-oe/recipes-graphics/xorg-proto/fixesproto_5.0.bbappend | 1 - meta-oe/recipes-graphics/xorg-proto/randrproto_1.3.2.bbappend | 1 - 9 files changed, 9 deletions(-) delete mode 100644 meta-oe/recipes-graphics/xorg-lib/libxcomposite_0.4.3.bbappend delete mode 100644 meta-oe/recipes-graphics/xorg-lib/libxcursor_1.1.13.bbappend delete mode 100644 meta-oe/recipes-graphics/xorg-lib/libxdamage_1.1.3.bbappend delete mode 100644 meta-oe/recipes-graphics/xorg-lib/libxfixes_5.0.bbappend delete mode 100644 meta-oe/recipes-graphics/xorg-lib/libxrandr_1.3.2.bbappend delete mode 100644 meta-oe/recipes-graphics/xorg-proto/compositeproto_0.4.2.bbappend delete mode 100644 meta-oe/recipes-graphics/xorg-proto/damageproto_1.2.1.bbappend delete mode 100644 meta-oe/recipes-graphics/xorg-proto/fixesproto_5.0.bbappend delete mode 100644 meta-oe/recipes-graphics/xorg-proto/randrproto_1.3.2.bbappend diff --git a/meta-oe/recipes-graphics/xorg-lib/libxcomposite_0.4.3.bbappend b/meta-oe/recipes-graphics/xorg-lib/libxcomposite_0.4.3.bbappend deleted file mode 100644 index d6f5869959..0000000000 --- a/meta-oe/recipes-graphics/xorg-lib/libxcomposite_0.4.3.bbappend +++ /dev/null @@ -1 +0,0 @@ -BBCLASSEXTEND += "native" diff --git a/meta-oe/recipes-graphics/xorg-lib/libxcursor_1.1.13.bbappend b/meta-oe/recipes-graphics/xorg-lib/libxcursor_1.1.13.bbappend deleted file mode 100644 index d6f5869959..0000000000 --- a/meta-oe/recipes-graphics/xorg-lib/libxcursor_1.1.13.bbappend +++ /dev/null @@ -1 +0,0 @@ -BBCLASSEXTEND += "native" diff --git a/meta-oe/recipes-graphics/xorg-lib/libxdamage_1.1.3.bbappend b/meta-oe/recipes-graphics/xorg-lib/libxdamage_1.1.3.bbappend deleted file mode 100644 index d6f5869959..0000000000 --- a/meta-oe/recipes-graphics/xorg-lib/libxdamage_1.1.3.bbappend +++ /dev/null @@ -1 +0,0 @@ -BBCLASSEXTEND += "native" diff --git a/meta-oe/recipes-graphics/xorg-lib/libxfixes_5.0.bbappend b/meta-oe/recipes-graphics/xorg-lib/libxfixes_5.0.bbappend deleted file mode 100644 index d6f5869959..0000000000 --- a/meta-oe/recipes-graphics/xorg-lib/libxfixes_5.0.bbappend +++ /dev/null @@ -1 +0,0 @@ -BBCLASSEXTEND += "native" diff --git a/meta-oe/recipes-graphics/xorg-lib/libxrandr_1.3.2.bbappend b/meta-oe/recipes-graphics/xorg-lib/libxrandr_1.3.2.bbappend deleted file mode 100644 index d6f5869959..0000000000 --- a/meta-oe/recipes-graphics/xorg-lib/libxrandr_1.3.2.bbappend +++ /dev/null @@ -1 +0,0 @@ -BBCLASSEXTEND += "native" diff --git a/meta-oe/recipes-graphics/xorg-proto/compositeproto_0.4.2.bbappend b/meta-oe/recipes-graphics/xorg-proto/compositeproto_0.4.2.bbappend deleted file mode 100644 index d6f5869959..0000000000 --- a/meta-oe/recipes-graphics/xorg-proto/compositeproto_0.4.2.bbappend +++ /dev/null @@ -1 +0,0 @@ -BBCLASSEXTEND += "native" diff --git a/meta-oe/recipes-graphics/xorg-proto/damageproto_1.2.1.bbappend b/meta-oe/recipes-graphics/xorg-proto/damageproto_1.2.1.bbappend deleted file mode 100644 index d6f5869959..0000000000 --- a/meta-oe/recipes-graphics/xorg-proto/damageproto_1.2.1.bbappend +++ /dev/null @@ -1 +0,0 @@ -BBCLASSEXTEND += "native" diff --git a/meta-oe/recipes-graphics/xorg-proto/fixesproto_5.0.bbappend b/meta-oe/recipes-graphics/xorg-proto/fixesproto_5.0.bbappend deleted file mode 100644 index d6f5869959..0000000000 --- a/meta-oe/recipes-graphics/xorg-proto/fixesproto_5.0.bbappend +++ /dev/null @@ -1 +0,0 @@ -BBCLASSEXTEND += "native" diff --git a/meta-oe/recipes-graphics/xorg-proto/randrproto_1.3.2.bbappend b/meta-oe/recipes-graphics/xorg-proto/randrproto_1.3.2.bbappend deleted file mode 100644 index d6f5869959..0000000000 --- a/meta-oe/recipes-graphics/xorg-proto/randrproto_1.3.2.bbappend +++ /dev/null @@ -1 +0,0 @@ -BBCLASSEXTEND += "native" From 59a641b2ae01d5628e5e9bccf160bc17c21e3064 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Wed, 2 May 2012 10:27:49 +0200 Subject: [PATCH 10/10] vala-dbus-biniding-tool: bump SRCREV * also needed to rebuild after libgee upgrade Signed-off-by: Martin Jansa --- .../vala-dbus-binding-tool/vala-dbus-binding-tool_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-oe/recipes-devtools/vala-dbus-binding-tool/vala-dbus-binding-tool_git.bb b/meta-oe/recipes-devtools/vala-dbus-binding-tool/vala-dbus-binding-tool_git.bb index 66df4edaff..30a7edd5c8 100644 --- a/meta-oe/recipes-devtools/vala-dbus-binding-tool/vala-dbus-binding-tool_git.bb +++ b/meta-oe/recipes-devtools/vala-dbus-binding-tool/vala-dbus-binding-tool_git.bb @@ -1,5 +1,5 @@ require vala-dbus-binding-tool.inc -SRCREV = "fd89af4941d6478575900128d09029fa5549e0db" +SRCREV = "2c72ff9c981be947837c72d3aa38e1fbf074068f" PV = "0.3.2+gitr${SRCPV}" SRC_URI = "${FREESMARTPHONE_GIT}/vala-dbus-binding-tool.git;protocol=git;branch=master"