Go to:
Gentoo Home
Documentation
Forums
Lists
Bugs
Planet
Store
Wiki
Get Gentoo!
Gentoo's Bugzilla – Attachment 277927 Details for
Bug 372721
[qt overlay] x11-libs/libmeegotouch-9999 doesn't compile
Home
|
New
–
[Ex]
|
Browse
|
Search
|
Privacy Policy
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
fix building libmeegotouch-9999
0001-Fix-building-libmeegotouch-master.patch (text/plain), 9.56 KB, created by
Maksim 'max_posedon' Melnikau
on 2011-06-23 21:45:50 UTC
(
hide
)
Description:
fix building libmeegotouch-9999
Filename:
MIME Type:
Creator:
Maksim 'max_posedon' Melnikau
Created:
2011-06-23 21:45:50 UTC
Size:
9.56 KB
patch
obsolete
>From b02350407d4022c3b286f6c2d615261ea2a1036a Mon Sep 17 00:00:00 2001 >From: Maksim 'max_posedon' Melnikau <maxposedon@gmail.com> >Date: Fri, 24 Jun 2011 00:22:33 +0300 >Subject: [PATCH] Fix building libmeegotouch master > >Signed-off-by: Maksim 'max_posedon' Melnikau <maxposedon@gmail.com> >--- > x11-libs/libmeegotouch/Manifest | 6 +- > .../files/disable-gconf-schemas.patch | 22 ----- > .../files/remove-automagic-deps.patch | 86 +++++++++++++++----- > .../temp_disable_ItemStopsFocusHandling.patch | 26 ++++++ > x11-libs/libmeegotouch/libmeegotouch-9999.ebuild | 18 +++- > 5 files changed, 109 insertions(+), 49 deletions(-) > delete mode 100644 x11-libs/libmeegotouch/files/disable-gconf-schemas.patch > create mode 100644 x11-libs/libmeegotouch/files/temp_disable_ItemStopsFocusHandling.patch > >diff --git a/x11-libs/libmeegotouch/Manifest b/x11-libs/libmeegotouch/Manifest >index b75ea29..d5afdf9 100644 >--- a/x11-libs/libmeegotouch/Manifest >+++ b/x11-libs/libmeegotouch/Manifest >@@ -1,4 +1,4 @@ >-AUX disable-gconf-schemas.patch 736 RMD160 d17078eb3bb420302722017b44894b616f50db20 SHA1 39461ad152db987548ddf45b642e76cd51721446 SHA256 6106ddd0ad0d52fbed93f5c3723374448f724156a65bd9d52dde5d631bfc0332 >-AUX remove-automagic-deps.patch 1287 RMD160 d91414f29a6d487a3d0bffbc3250e051bab673ca SHA1 d3decff660bc2cd257a533f5059b8b6a9fa9644e SHA256 4184f562f5b60df4ed89819a796c5267f92142341b4c8dad5c2be2c5ede63860 >-EBUILD libmeegotouch-9999.ebuild 2537 RMD160 3d6aaab45543e30a5f6a79b90bee185c49f5be37 SHA1 d5ef60f03dcbb57f6487f144bf3470470ebca6d1 SHA256 33b0f5b951651fad3854019f10a9b7717bdd6969f755dd8db740664fd01e2c39 >+AUX remove-automagic-deps.patch 2871 RMD160 0e662fc5c17d1343b2ff3f8415bf68cc7c75fd24 SHA1 821da8d7dc73ff7c0b1bb2bf1e6b3390b607a52a SHA256 6e0a34489b700015e365605c60bc86b15ce076abdd0efce095d4d9baae8095ee >+AUX temp_disable_ItemStopsFocusHandling.patch 1332 RMD160 edc3e9332be23f669689e12a179e778afdea260e SHA1 642647066fa66b9ed3043b8f02398691b162a7ef SHA256 4bcfafea4f994fc98940016e5911ca0261d7f0012dbb18c6e2a9a9561238e621 >+EBUILD libmeegotouch-9999.ebuild 2595 RMD160 bb27dec00deb25bdea40160570f29b2d1f2a5919 SHA1 3ab790a6a9741f7b37e3e11c7a1285f88bc57e5e SHA256 a7a0c1a1ff6870eb09331678bfb35e79f8be0bee793525bdb3e0d87577632504 > MISC metadata.xml 524 RMD160 8bf7f3c9aa846f6ee570d58121d5907c3c310834 SHA1 d7af6bfef045435c05fddadd881dba041237406c SHA256 211f0469c509a7832cec4a5f7a75db54306932cbd0b2f7f32bac9eb3113fb516 >diff --git a/x11-libs/libmeegotouch/files/disable-gconf-schemas.patch b/x11-libs/libmeegotouch/files/disable-gconf-schemas.patch >deleted file mode 100644 >index 2331bc3..0000000 >--- a/x11-libs/libmeegotouch/files/disable-gconf-schemas.patch >+++ /dev/null >@@ -1,22 +0,0 @@ >-diff --git a/src/src.pro b/src/src.pro >-index f60a9dc..5cea0c7 100644 >---- a/src/src.pro >-+++ b/src/src.pro >-@@ -9,17 +9,6 @@ win32|macx:SUBDIRS -= settings extensions >- >- include(../mkspecs/common.pri) >- >--contains(DEFINES, HAVE_GCONF) { >-- # install gconf schema >-- unix { >-- schemas.CONFIG += no_check_exist >-- schemas.files = $${IN_PWD}/data/meegotouch.schemas >-- schemas.path = $${M_SYSCONFDIR}/gconf/schemas >-- schemas.commands = GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) gconftool-2 --makefile-install-rule $${IN_PWD}/data/meegotouch.schemas >-- INSTALLS += schemas >-- } >--} >-- >- #install device configuration file >- devices.CONFIG += no_check_exist >- devices.files = $${IN_PWD}/data/devices.conf >diff --git a/x11-libs/libmeegotouch/files/remove-automagic-deps.patch b/x11-libs/libmeegotouch/files/remove-automagic-deps.patch >index 4ae0cbf..bda633e 100644 >--- a/x11-libs/libmeegotouch/files/remove-automagic-deps.patch >+++ b/x11-libs/libmeegotouch/files/remove-automagic-deps.patch >@@ -1,8 +1,6 @@ >-diff --git a/configure b/configure >-index 594e4eb..72a9031 100755 >---- a/configure >-+++ b/configure >-@@ -364,50 +364,6 @@ if [ "$CFG_ICU" != "no" ]; then >+--- libmeegotouch-9999/configure.old 2011-06-17 00:29:23.045450001 +0300 >++++ libmeegotouch-9999/configure 2011-06-17 00:30:33.715450004 +0300 >+@@ -406,100 +406,6 @@ > fi > fi > >@@ -10,7 +8,7 @@ index 594e4eb..72a9031 100755 > -which pkg-config > /dev/null > -if [ $? -eq 0 ]; then > - >-- pkg-config --exists contextsubscriber-1.0 >+- pkg-config --atleast-version=0.5.25 contextsubscriber-1.0 > - if [ $? -eq 0 ]; then > - HAVE_CONTEXTSUBSCRIBER=yes > - fi >@@ -28,28 +26,78 @@ index 594e4eb..72a9031 100755 > - fi > - fi > - >-- pkg-config --exists gstreamer-0.10 >-- if [ $? -eq 0 ]; then >-- HAVE_GSTREAMER=yes >+- # Test for DBus >+- if [ "$CFG_DBUS" != "no" ]; then >+- pkg-config --exists QtDBus >+- if [ $? -eq 0 ]; then >+- HAVE_DBUS=yes >+- fi >+- if [ "$CFG_DBUS" = "yes" -a "$HAVE_DBUS" = "no" ]; then >+- echo "You specified -dbus but dbus was not found." >+- echo "Please install the DBus and QtDBus packages." >+- exit 1 >+- fi > - fi > - >-- pkg-config --exists QtDBus >-- if [ $? -eq 0 ]; then >-- HAVE_DBUS=yes >-- fi >-- > - pkg-config --exists contentaction-0.1 > - if [ $? -eq 0 ]; then > - #HAVE_CONTENTACTION=yes DISABLED FOR NOW > - HAVE_CONTENTACTION=no > - fi > - >-- if [ "$SBOX_UNAME_MACHINE" = "arm" ]; then >-- IS_ARMEL=yes >+- # use xdamage, xfixes and xcomposite only on Linux platform >+- if [ "$HAVE_LINUX" != "no" ]; then >+- pkg-config --exists xdamage >+- if [ $? -eq 0 ]; then >+- HAVE_XDAMAGE=yes >+- fi >+- >+- pkg-config --exists xfixes >+- if [ $? -eq 0 ]; then >+- HAVE_XFIXES=yes >+- fi >+- >+- pkg-config --exists xcomposite >+- if [ $? -eq 0 ]; then >+- HAVE_XCOMPOSITE=yes >+- fi >+- fi >+- >+- pkg-config --exists x11-xcb xcb >+- if [ $? -eq 0 ]; then >+- HAVE_X11_XCB=yes >+- fi >+- >+- pkg-config --exists xcb-composite >+- if [ $? -eq 0 ]; then >+- HAVE_XCB_COMPOSITE=yes > - fi > - >+- # For Scratchbox and For OBS/MeeGo >+- if [ ! -z "`uname -m | grep arm`" ]; then >+- IS_ARMEL=yes >+- fi >+- >+- if [ "$CFG_MEEGOGRAPHICSSYSTEM" != "no" ]; then >+- if [ "$IS_ARMEL" = "yes" ]; then >+- HAVE_MEEGOGRAPHICSSYSTEM=yes >+- CFG_MEEGOGRAPHICSSYSTEM=yes >+- else >+- if [ "$CFG_MEEGOGRAPHICSSYSTEM" = "yes" ]; then >+- #we need this for intel devices but not for scratchbox >+- echo "WARNING: MeeGo graphicssystem is enabled for x86" >+- HAVE_MEEGOGRAPHICSSYSTEM=yes >+- fi >+- fi >+- fi >+- >+- # For Non-graphical feedback framework (NGF) client >+- pkg-config --exists libngf0 >+- if [ $? -eq 0 ]; then >+- HAVE_LIBNGF=yes >+- fi > -fi > - >- >- >- #------------------------------------------------------------------------------- >+ # Test for qt service framework >+ which servicexmlgen > /dev/null >+ if [ $? -eq 0 ]; then >diff --git a/x11-libs/libmeegotouch/files/temp_disable_ItemStopsFocusHandling.patch b/x11-libs/libmeegotouch/files/temp_disable_ItemStopsFocusHandling.patch >new file mode 100644 >index 0000000..76b0f82 >--- /dev/null >+++ b/x11-libs/libmeegotouch/files/temp_disable_ItemStopsFocusHandling.patch >@@ -0,0 +1,26 @@ >+diff --git a/src/corelib/scene/mscene.cpp b/src/corelib/scene/mscene.cpp >+index 7a12284..b1c7d90 100644 >+--- a/src/corelib/scene/mscene.cpp >++++ b/src/corelib/scene/mscene.cpp >+@@ -562,7 +562,7 @@ void MScenePrivate::handleFocusChange(QGraphicsSceneMouseEvent *event) >+ // check if it has a focus proxy and let's continue with that instead. >+ item = item->focusProxy() ? item->focusProxy() : item; >+ >+- if (item->flags() & QGraphicsItem::ItemStopsFocusHandling) manualFocusForced = true; >++// if (item->flags() & QGraphicsItem::ItemStopsFocusHandling) manualFocusForced = true; >+ if (item->isEnabled() >+ && (item->flags() & QGraphicsItem::ItemIsFocusable) >+ && (!item->isWidget() >+diff --git a/src/corelib/widgets/mpannablewidget.cpp b/src/corelib/widgets/mpannablewidget.cpp >+index 296b788..0aa000e 100644 >+--- a/src/corelib/widgets/mpannablewidget.cpp >++++ b/src/corelib/widgets/mpannablewidget.cpp >+@@ -96,7 +96,7 @@ void MPannableWidgetPrivate::init() >+ >+ glass->setObjectName("glass"); >+ glass->grabGesture(Qt::TapAndHoldGesture); >+- glass->setFlags(QGraphicsItem::ItemStopsFocusHandling); >++ //glass->setFlags(QGraphicsItem::ItemStopsFocusHandling); >+ >+ q->grabGestureWithCancelPolicy(Qt::PanGesture, Qt::GestureFlags(), MWidget::MouseEventCancelOnGestureStarted); >+ >diff --git a/x11-libs/libmeegotouch/libmeegotouch-9999.ebuild b/x11-libs/libmeegotouch/libmeegotouch-9999.ebuild >index 194fc68..8c1cb19 100644 >--- a/x11-libs/libmeegotouch/libmeegotouch-9999.ebuild >+++ b/x11-libs/libmeegotouch/libmeegotouch-9999.ebuild >@@ -33,10 +33,10 @@ DEPEND="${COMMON_DEPEND} > RDEPEND="${COMMON_DEPEND} > ~x11-themes/meegotouch-theme-${PV}" > >-# disable installation of gconf schemas until we have a fix for >-# the sandbox violation >-PATCHES=( "${FILESDIR}/remove-automagic-deps.patch" >- "${FILESDIR}/disable-gconf-schemas.patch" ) >+PATCHES=( >+ #"${FILESDIR}/remove-automagic-deps.patch" >+ "${FILESDIR}/temp_disable_ItemStopsFocusHandling.patch" >+ ) > > DOCS="README" > >@@ -93,8 +93,16 @@ src_configure() { > enable_feature gconf GCONF > enable_feature gstreamer GSTREAMER > >+ local myconf >+ >+ if use debug ; then >+ myconf="${myconf} --no-release -debug" >+ else >+ myconf="${myconf} -release --no-debug" >+ fi >+ > # custom configure script >- QTDIR=/usr ./configure -release \ >+ QTDIR=/usr ./configure ${myconf}\ > -prefix "/usr" \ > -libdir "/usr/$(get_libdir)" \ > $(use_make plainqt) \ >-- >1.7.5.3 >
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 372721
: 277927