Attachment #277927 for bug #372721

View | Details | Raw Unified | Return to bug 372721
Collapse All | Expand All

Lines 1-4 Link Here

(-)a/x11-libs/libmeegotouch/Manifest (-3 / +3 lines)
1	AUX disable-gconf-schemas.patch 736 RMD160 d17078eb3bb420302722017b44894b616f50db20 SHA1 39461ad152db987548ddf45b642e76cd51721446 SHA256 6106ddd0ad0d52fbed93f5c3723374448f724156a65bd9d52dde5d631bfc0332	1	AUX remove-automagic-deps.patch 2871 RMD160 0e662fc5c17d1343b2ff3f8415bf68cc7c75fd24 SHA1 821da8d7dc73ff7c0b1bb2bf1e6b3390b607a52a SHA256 6e0a34489b700015e365605c60bc86b15ce076abdd0efce095d4d9baae8095ee
2	AUX remove-automagic-deps.patch 1287 RMD160 d91414f29a6d487a3d0bffbc3250e051bab673ca SHA1 d3decff660bc2cd257a533f5059b8b6a9fa9644e SHA256 4184f562f5b60df4ed89819a796c5267f92142341b4c8dad5c2be2c5ede63860	2	AUX temp_disable_ItemStopsFocusHandling.patch 1332 RMD160 edc3e9332be23f669689e12a179e778afdea260e SHA1 642647066fa66b9ed3043b8f02398691b162a7ef SHA256 4bcfafea4f994fc98940016e5911ca0261d7f0012dbb18c6e2a9a9561238e621
3	EBUILD libmeegotouch-9999.ebuild 2537 RMD160 3d6aaab45543e30a5f6a79b90bee185c49f5be37 SHA1 d5ef60f03dcbb57f6487f144bf3470470ebca6d1 SHA256 33b0f5b951651fad3854019f10a9b7717bdd6969f755dd8db740664fd01e2c39	3	EBUILD libmeegotouch-9999.ebuild 2595 RMD160 bb27dec00deb25bdea40160570f29b2d1f2a5919 SHA1 3ab790a6a9741f7b37e3e11c7a1285f88bc57e5e SHA256 a7a0c1a1ff6870eb09331678bfb35e79f8be0bee793525bdb3e0d87577632504
4	MISC metadata.xml 524 RMD160 8bf7f3c9aa846f6ee570d58121d5907c3c310834 SHA1 d7af6bfef045435c05fddadd881dba041237406c SHA256 211f0469c509a7832cec4a5f7a75db54306932cbd0b2f7f32bac9eb3113fb516	4	MISC metadata.xml 524 RMD160 8bf7f3c9aa846f6ee570d58121d5907c3c310834 SHA1 d7af6bfef045435c05fddadd881dba041237406c SHA256 211f0469c509a7832cec4a5f7a75db54306932cbd0b2f7f32bac9eb3113fb516




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




--- libmeegotouch-9999/configure.old	2011-06-17 00:29:23.045450001 +0300
index 594e4eb..72a9031 100755
--- a/configure
+++ b/configure
@@ -364,50 +364,6 @@ if [ "$CFG_ICU" != "no" ]; then

-which pkg-config > /dev/null
-if [ $? -eq 0 ]; then
-
-    pkg-config --atleast-version=0.5.25 contextsubscriber-1.0
-    if [ $? -eq 0 ]; then
-        HAVE_CONTEXTSUBSCRIBER=yes
-    fi

-        fi
-    fi
-
-    # 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
-
-    # 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/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);
 




RDEPEND="${COMMON_DEPEND}
	~x11-themes/meegotouch-theme-${PV}"

PATCHES=(
	#"${FILESDIR}/remove-automagic-deps.patch"
	"${FILESDIR}/temp_disable_ItemStopsFocusHandling.patch"
	)

DOCS="README"


	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 ${myconf}\
	    -prefix "/usr" \
		-libdir "/usr/$(get_libdir)" \
		$(use_make plainqt) \
- 

Return to bug 372721

Lines 1-22 Link Here

(-)a/x11-libs/libmeegotouch/files/disable-gconf-schemas.patch (-22 lines)
1	diff --git a/src/src.pro b/src/src.pro
2	index f60a9dc..5cea0c7 100644
3	--- a/src/src.pro
4	+++ b/src/src.pro
5	@@ -9,17 +9,6 @@ win32\|macx:SUBDIRS -= settings extensions
6
7	include(../mkspecs/common.pri)
8
9	-contains(DEFINES, HAVE_GCONF) {
10	- # install gconf schema
11	- unix {
12	- schemas.CONFIG += no_check_exist
13	- schemas.files = $${IN_PWD}/data/meegotouch.schemas
14	- schemas.path = $${M_SYSCONFDIR}/gconf/schemas
15	- schemas.commands = GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) gconftool-2 --makefile-install-rule $${IN_PWD}/data/meegotouch.schemas
16	- INSTALLS += schemas
17	- }
18	-}
19	-
20	#install device configuration file
21	devices.CONFIG += no_check_exist
22	devices.files = $${IN_PWD}/data/devices.conf

Lines 1-8 Link Here

(-)a/x11-libs/libmeegotouch/files/remove-automagic-deps.patch (-19 / +65 lines)
1	diff --git a/configure b/configure	1	--- libmeegotouch-9999/configure.old 2011-06-17 00:29:23.045450001 +0300
2	index 594e4eb..72a9031 100755
3	--- a/configure
4	+++ b/configure
5	@@ -364,50 +364,6 @@ if [ "$CFG_ICU" != "no" ]; then
Lines 10-16 index 594e4eb..72a9031 100755 Link Here
10	-which pkg-config > /dev/null	8	-which pkg-config > /dev/null
11	-if [ $? -eq 0 ]; then	9	-if [ $? -eq 0 ]; then
12	-	10	-
13	- pkg-config --exists contextsubscriber-1.0	11	- pkg-config --atleast-version=0.5.25 contextsubscriber-1.0
14	- if [ $? -eq 0 ]; then	12	- if [ $? -eq 0 ]; then
15	- HAVE_CONTEXTSUBSCRIBER=yes	13	- HAVE_CONTEXTSUBSCRIBER=yes
16	- fi	14	- fi
Lines 28-55 index 594e4eb..72a9031 100755 Link Here
28	- fi	26	- fi
29	- fi	27	- fi
30	-	28	-
31	- pkg-config --exists gstreamer-0.10	29	- # Test for DBus
32	- if [ $? -eq 0 ]; then	30	- if [ "$CFG_DBUS" != "no" ]; then
33	- HAVE_GSTREAMER=yes	31	- pkg-config --exists QtDBus
		32	- if [ $? -eq 0 ]; then
		33	- HAVE_DBUS=yes
		34	- fi
		35	- if [ "$CFG_DBUS" = "yes" -a "$HAVE_DBUS" = "no" ]; then
		36	- echo "You specified -dbus but dbus was not found."
		37	- echo "Please install the DBus and QtDBus packages."
		38	- exit 1
		39	- fi
34	- fi	40	- fi
35	-	41	-
36	- pkg-config --exists QtDBus
37	- if [ $? -eq 0 ]; then
38	- HAVE_DBUS=yes
39	- fi
40	-
41	- pkg-config --exists contentaction-0.1	42	- pkg-config --exists contentaction-0.1
42	- if [ $? -eq 0 ]; then	43	- if [ $? -eq 0 ]; then
43	- #HAVE_CONTENTACTION=yes DISABLED FOR NOW	44	- #HAVE_CONTENTACTION=yes DISABLED FOR NOW
44	- HAVE_CONTENTACTION=no	45	- HAVE_CONTENTACTION=no
45	- fi	46	- fi
46	-	47	-
47	- if [ "$SBOX_UNAME_MACHINE" = "arm" ]; then	48	- # use xdamage, xfixes and xcomposite only on Linux platform
48	- IS_ARMEL=yes	49	- if [ "$HAVE_LINUX" != "no" ]; then
		50	- pkg-config --exists xdamage
		51	- if [ $? -eq 0 ]; then
		52	- HAVE_XDAMAGE=yes
		53	- fi
		54	-
		55	- pkg-config --exists xfixes
		56	- if [ $? -eq 0 ]; then
		57	- HAVE_XFIXES=yes
		58	- fi
		59	-
		60	- pkg-config --exists xcomposite
		61	- if [ $? -eq 0 ]; then
		62	- HAVE_XCOMPOSITE=yes
		63	- fi
		64	- fi
		65	-
		66	- pkg-config --exists x11-xcb xcb
		67	- if [ $? -eq 0 ]; then
		68	- HAVE_X11_XCB=yes
		69	- fi
		70	-
		71	- pkg-config --exists xcb-composite
		72	- if [ $? -eq 0 ]; then
		73	- HAVE_XCB_COMPOSITE=yes
49	- fi	74	- fi
50	-	75	-
		76	- # For Scratchbox and For OBS/MeeGo
		77	- if [ ! -z "`uname -m \| grep arm`" ]; then
		78	- IS_ARMEL=yes
		79	- fi
		80	-
		81	- if [ "$CFG_MEEGOGRAPHICSSYSTEM" != "no" ]; then
		82	- if [ "$IS_ARMEL" = "yes" ]; then
		83	- HAVE_MEEGOGRAPHICSSYSTEM=yes
		84	- CFG_MEEGOGRAPHICSSYSTEM=yes
		85	- else
		86	- if [ "$CFG_MEEGOGRAPHICSSYSTEM" = "yes" ]; then
		87	- #we need this for intel devices but not for scratchbox
		88	- echo "WARNING: MeeGo graphicssystem is enabled for x86"
		89	- HAVE_MEEGOGRAPHICSSYSTEM=yes
		90	- fi
		91	- fi
		92	- fi
		93	-
		94	- # For Non-graphical feedback framework (NGF) client
		95	- pkg-config --exists libngf0
		96	- if [ $? -eq 0 ]; then
		97	- HAVE_LIBNGF=yes
		98	- fi
51	-fi	99	-fi
52	-	100	-
53		101	# Test for qt service framework
54		102	which servicexmlgen > /dev/null
55	#-------------------------------------------------------------------------------	103	if [ $? -eq 0 ]; then

Line 0 Link Here

(-)a/x11-libs/libmeegotouch/files/temp_disable_ItemStopsFocusHandling.patch (+26 lines)
	1	diff --git a/src/corelib/scene/mscene.cpp b/src/corelib/scene/mscene.cpp
	2	index 7a12284..b1c7d90 100644
	3	--- a/src/corelib/scene/mscene.cpp
	4	+++ b/src/corelib/scene/mscene.cpp
	5	@@ -562,7 +562,7 @@ void MScenePrivate::handleFocusChange(QGraphicsSceneMouseEvent *event)
	6	// check if it has a focus proxy and let's continue with that instead.
	7	item = item->focusProxy() ? item->focusProxy() : item;
	8
	9	- if (item->flags() & QGraphicsItem::ItemStopsFocusHandling) manualFocusForced = true;
	10	+// if (item->flags() & QGraphicsItem::ItemStopsFocusHandling) manualFocusForced = true;
	11	if (item->isEnabled()
	12	&& (item->flags() & QGraphicsItem::ItemIsFocusable)
	13	&& (!item->isWidget()
	14	diff --git a/src/corelib/widgets/mpannablewidget.cpp b/src/corelib/widgets/mpannablewidget.cpp
	15	index 296b788..0aa000e 100644
	16	--- a/src/corelib/widgets/mpannablewidget.cpp
	17	+++ b/src/corelib/widgets/mpannablewidget.cpp
	18	@@ -96,7 +96,7 @@ void MPannableWidgetPrivate::init()
	19
	20	glass->setObjectName("glass");
	21	glass->grabGesture(Qt::TapAndHoldGesture);
	22	- glass->setFlags(QGraphicsItem::ItemStopsFocusHandling);
	23	+ //glass->setFlags(QGraphicsItem::ItemStopsFocusHandling);
	24
	25	q->grabGestureWithCancelPolicy(Qt::PanGesture, Qt::GestureFlags(), MWidget::MouseEventCancelOnGestureStarted);
	26

Lines 33-42 DEPEND="${COMMON_DEPEND} Link Here

(-)a/x11-libs/libmeegotouch/libmeegotouch-9999.ebuild (-6 / +13 lines)
33	RDEPEND="${COMMON_DEPEND}	33	RDEPEND="${COMMON_DEPEND}
34	~x11-themes/meegotouch-theme-${PV}"	34	~x11-themes/meegotouch-theme-${PV}"
35		35
36	# disable installation of gconf schemas until we have a fix for	36	PATCHES=(
37	# the sandbox violation	37	#"${FILESDIR}/remove-automagic-deps.patch"
38	PATCHES=( "${FILESDIR}/remove-automagic-deps.patch"	38	"${FILESDIR}/temp_disable_ItemStopsFocusHandling.patch"
39	"${FILESDIR}/disable-gconf-schemas.patch" )	39	)
40		40
41	DOCS="README"	41	DOCS="README"
42		42
Lines 93-100 src_configure() { Link Here
93	enable_feature gconf GCONF	93	enable_feature gconf GCONF
94	enable_feature gstreamer GSTREAMER	94	enable_feature gstreamer GSTREAMER
95		95
		96	local myconf
		97
		98	if use debug ; then
		99	myconf="${myconf} --no-release -debug"
		100	else
		101	myconf="${myconf} -release --no-debug"
		102	fi
		103
96	# custom configure script	104	# custom configure script
97	QTDIR=/usr ./configure -release \	105	QTDIR=/usr ./configure ${myconf}\
98	-prefix "/usr" \	106	-prefix "/usr" \
99	-libdir "/usr/$(get_libdir)" \	107	-libdir "/usr/$(get_libdir)" \
100	$(use_make plainqt) \	108	$(use_make plainqt) \
101	-