From 90fffaa45e80badf0314d82e921ad98fc5d77da6 Mon Sep 17 00:00:00 2001 From: Matthias Hentges Date: Fri, 24 Mar 2006 16:28:17 +0000 Subject: gpe-bootsplash: Fix a bug where an uncompressed screendump was written to the rootfs. This causes space issues on devices with large screens and low rootfs space. --- packages/gpe-bootsplash/files/speed.patch | 2 +- packages/gpe-bootsplash/gpe-bootsplash_1.15.bb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/gpe-bootsplash/files/speed.patch b/packages/gpe-bootsplash/files/speed.patch index 32d0432a87..cc670d00e4 100644 --- a/packages/gpe-bootsplash/files/speed.patch +++ b/packages/gpe-bootsplash/files/speed.patch @@ -38,7 +38,7 @@ + then + readlink /usr/share/gpe/$source_link > /etc/bootsplash.name + -+ cat /dev/fb0 > /etc/bootsplash.raw ; gzip /etc/bootsplash.raw ++ cat /dev/fb0 | gzip >/etc/bootsplash.raw.gz + else + echo -e "\nNOTE: gpe-bootsplash failed to start" >/dev/tty2 + sleep 3 diff --git a/packages/gpe-bootsplash/gpe-bootsplash_1.15.bb b/packages/gpe-bootsplash/gpe-bootsplash_1.15.bb index ca48c6086b..761a0500c7 100644 --- a/packages/gpe-bootsplash/gpe-bootsplash_1.15.bb +++ b/packages/gpe-bootsplash/gpe-bootsplash_1.15.bb @@ -5,7 +5,7 @@ MAINTAINER = "Phil Blundell " SECTION = "gpe" PRIORITY = "optional" LICENSE = "GPL" -PR = "r3" +PR = "r4" SRC_URI += "file://splash-p.svg \ file://splash-l.svg \ -- cgit v1.2.3 From 9bdc8f5fe8909e822bb1d185aa2de5f35b296e4a Mon Sep 17 00:00:00 2001 From: Matthias Hentges Date: Fri, 24 Mar 2006 17:40:14 +0000 Subject: zaurusd: Honor user-preferences when starting / killing mbinputmgr on rotation --- packages/zaurusd/files/.mtn2git_empty | 0 .../files/mbinputmgr-honor-user-prefs.patch | 65 ++++++++++++++++++++++ packages/zaurusd/zaurusd_svn.bb | 5 +- 3 files changed, 68 insertions(+), 2 deletions(-) create mode 100644 packages/zaurusd/files/.mtn2git_empty create mode 100644 packages/zaurusd/files/mbinputmgr-honor-user-prefs.patch diff --git a/packages/zaurusd/files/.mtn2git_empty b/packages/zaurusd/files/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/zaurusd/files/mbinputmgr-honor-user-prefs.patch b/packages/zaurusd/files/mbinputmgr-honor-user-prefs.patch new file mode 100644 index 0000000000..f4ef7c5aee --- /dev/null +++ b/packages/zaurusd/files/mbinputmgr-honor-user-prefs.patch @@ -0,0 +1,65 @@ +--- zaurusd/scripts/zaurus-hinge.in 2006-03-24 18:23:15.000000000 +0100 ++++ zaurusd/scripts/zaurus-hinge 2006-03-24 18:33:24.480748696 +0100 +@@ -18,6 +18,10 @@ + exit 1 + fi + ++panel_user="`ps aux|grep matchbox-panel|grep -v grep | awk '{print $2}'`" ++ ++ ++ + STATE=$1 + + if [ $STATE = "3" ]; then +@@ -29,8 +33,21 @@ + fi + + if [ $STATE = "0" ]; then +- #echo "lanscape" +- killproc @bindir@/mbinputmgr ++ #echo "landscape" ++ ++ # As matchbox-panel updates its written configuration right after an applet dies / is killed, we can not be sure ++ # whether the user had gpe-panel in his preferences after rotating to portrait. And since there is a slim chance ++ # that a user changes his preferences from time to time, we renew that dumped configuration every now and then ;) ++ ++ if ! test -e "/tmp/gpe-panel.session-$panel_user" ++ then ++ cp /home/$panel_user/.matchbox/mbdock.session "/tmp/gpe-panel.session-$panel_user" ++ cat "/tmp/gpe-panel.session-$panel_user" | grep -q panel || killproc @bindir@/mbinputmgr ++ else ++ cat "/tmp/gpe-panel.session-$panel_user" | grep -q panel || killproc @bindir@/mbinputmgr ++ rm "/tmp/gpe-panel.session-$panel_user" ++ fi ++ + # urg mbinputmgr should kill below + killproc @bindir@/matchbox-keyboard + killproc @bindir@/matchbox-stroke +@@ -47,8 +64,25 @@ + fi + # just to be extra safe + sleep 1 +- if [ -x @bindir@/mbinputmgr ]; then +- @bindir@/mbinputmgr & ++ ++ echo "panel_user = [$panel_user]" ++ ++ if ! test -e "/tmp/gpe-panel.session-$panel_user" ++ then ++ cp /home/$panel_user/.matchbox/mbdock.session "/tmp/gpe-panel.session-$panel_user" ++ else ++ rm "/tmp/gpe-panel.session-$panel_user" + fi ++ ++ if test -n "$panel_user" ++ then ++ echo "Running panel as user [$panel_user]" ++ ps aux | grep "$panel_user" | grep -q "mbinputmgr " || su $panel_user -c @bindir@/mbinputmgr & ++ else ++ # A failsafe can't hurt ++ echo "Warning: Running mbinputmgr as root!" ++ ps aux | grep -q "mbinputmgr " || @bindir@/mbinputmgr & ++ fi ++ + exit 0 + fi diff --git a/packages/zaurusd/zaurusd_svn.bb b/packages/zaurusd/zaurusd_svn.bb index d36fc1c118..4f20dc23c5 100644 --- a/packages/zaurusd/zaurusd_svn.bb +++ b/packages/zaurusd/zaurusd_svn.bb @@ -3,10 +3,11 @@ SECTION = "base" MAINTAINER = "Richard Purdie " DESCRIPTION = "Daemon to handle device specifc features." PV = "0.0+svn${SRCDATE}" -PR = "r0" +PR = "r1" DEPENDS = "tslib" -SRC_URI = "svn://svn.o-hand.com/repos/misc/trunk;module=zaurusd;proto=http" +SRC_URI = "svn://svn.o-hand.com/repos/misc/trunk;module=zaurusd;proto=http \ + file://mbinputmgr-honor-user-prefs.patch;patch=1" S = "${WORKDIR}/${PN}" PACKAGE_ARCH = "${MACHINE_ARCH}" -- cgit v1.2.3 From 84c51473b8f28a719e217155c620e2dd08c512e3 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Sat, 25 Mar 2006 16:41:55 +0000 Subject: mb-applet-task: add a task switcher applet for matchbox-panel --- packages/matchbox-applet-tasks/.mtn2git_empty | 0 .../matchbox-applet-tasks/mb-applet-tasks_1.0.0.bb | 28 ++++++++++++++++++++++ 2 files changed, 28 insertions(+) create mode 100644 packages/matchbox-applet-tasks/.mtn2git_empty create mode 100644 packages/matchbox-applet-tasks/mb-applet-tasks_1.0.0.bb diff --git a/packages/matchbox-applet-tasks/.mtn2git_empty b/packages/matchbox-applet-tasks/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/matchbox-applet-tasks/mb-applet-tasks_1.0.0.bb b/packages/matchbox-applet-tasks/mb-applet-tasks_1.0.0.bb new file mode 100644 index 0000000000..c8e2ff3fd1 --- /dev/null +++ b/packages/matchbox-applet-tasks/mb-applet-tasks_1.0.0.bb @@ -0,0 +1,28 @@ +DESCRIPTION = "Tasks applet switcher for matchbox" +LICENSE = "GPLv2" +MAINTAINER = "Koen Kooi Date: Sat, 25 Mar 2006 18:11:35 +0000 Subject: mb-applet-tasks: fix typo --- packages/matchbox-applet-tasks/mb-applet-tasks_1.0.0.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/matchbox-applet-tasks/mb-applet-tasks_1.0.0.bb b/packages/matchbox-applet-tasks/mb-applet-tasks_1.0.0.bb index c8e2ff3fd1..6d52e9659d 100644 --- a/packages/matchbox-applet-tasks/mb-applet-tasks_1.0.0.bb +++ b/packages/matchbox-applet-tasks/mb-applet-tasks_1.0.0.bb @@ -1,6 +1,6 @@ DESCRIPTION = "Tasks applet switcher for matchbox" LICENSE = "GPLv2" -MAINTAINER = "Koen Kooi Date: Sun, 26 Mar 2006 15:28:47 +0000 Subject: Update several DEPENDS to match recent xlibs renaming --- packages/gtk+/gtk+_2.8.16.bb | 2 +- packages/pango/pango_1.12.0.bb | 2 +- packages/xlibs/libx11-native_6.2.1.bb | 2 +- packages/xlibs/libx11-native_cvs.bb | 2 +- packages/xlibs/libxext-native_cvs.bb | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/packages/gtk+/gtk+_2.8.16.bb b/packages/gtk+/gtk+_2.8.16.bb index 5f96cd2c3a..474858856c 100644 --- a/packages/gtk+/gtk+_2.8.16.bb +++ b/packages/gtk+/gtk+_2.8.16.bb @@ -5,7 +5,7 @@ HOMEPAGE = "http://www.gtk.org" SECTION = "libs" PRIORITY = "optional" MAINTAINER = "Philip Blundell " -DEPENDS = "glib-2.0 pango atk jpeg libpng xext libxcursor gtk-doc libgcrypt cairo" +DEPENDS = "glib-2.0 pango atk jpeg libpng libxext libxcursor gtk-doc libgcrypt cairo" PR = "r2" DEFAULT_PREFERENCE = "-1" diff --git a/packages/pango/pango_1.12.0.bb b/packages/pango/pango_1.12.0.bb index 4b6459e034..e06e659b7b 100644 --- a/packages/pango/pango_1.12.0.bb +++ b/packages/pango/pango_1.12.0.bb @@ -1,7 +1,7 @@ LICENSE = "LGPL" SECTION = "x11/libs" # Xt needed to keep autoconf's check for X11 happy -DEPENDS = "glib-2.0 fontconfig freetype zlib x11 libxft xt gtk-doc cairo" +DEPENDS = "glib-2.0 fontconfig freetype zlib libx11 libxft libxt gtk-doc cairo" DESCRIPTION = "The goal of the Pango project is to provide an \ Open Source framework for the layout and rendering of \ internationalized text." diff --git a/packages/xlibs/libx11-native_6.2.1.bb b/packages/xlibs/libx11-native_6.2.1.bb index b1fd2aa0db..f27ab343a4 100644 --- a/packages/xlibs/libx11-native_6.2.1.bb +++ b/packages/xlibs/libx11-native_6.2.1.bb @@ -1,5 +1,5 @@ SECTION = "x11/base" include libx11_${PV}.bb inherit native -DEPENDS = "xproto-native xextensions-native xau-native xtrans-native libxdmcp-native" +DEPENDS = "xproto-native xextensions-native libxau-native xtrans-native libxdmcp-native" PROVIDES = "" diff --git a/packages/xlibs/libx11-native_cvs.bb b/packages/xlibs/libx11-native_cvs.bb index 161c070899..5b221122d3 100644 --- a/packages/xlibs/libx11-native_cvs.bb +++ b/packages/xlibs/libx11-native_cvs.bb @@ -1,5 +1,5 @@ SECTION = "x11/base" include libx11_cvs.bb inherit native -DEPENDS = "xproto-native xextensions-native xau-native xtrans-native libxdmcp-native" +DEPENDS = "xproto-native xextensions-native libxau-native xtrans-native libxdmcp-native" PROVIDES = "" diff --git a/packages/xlibs/libxext-native_cvs.bb b/packages/xlibs/libxext-native_cvs.bb index 296a741ebf..295bae2584 100644 --- a/packages/xlibs/libxext-native_cvs.bb +++ b/packages/xlibs/libxext-native_cvs.bb @@ -1,5 +1,5 @@ SECTION = "unknown" include libxext_${PV}.bb inherit native -DEPENDS = "x11-native xextensions-native" +DEPENDS = "libx11-native xextensions-native" PROVIDES = "" -- cgit v1.2.3 From 94b6e37d579793c54f2dfe66ee0cd050b16f4e36 Mon Sep 17 00:00:00 2001 From: Matthias Hentges Date: Sun, 26 Mar 2006 16:13:04 +0000 Subject: mplayer: Add mplayer-common, ported from 3.5.4.1 --- packages/mplayer/mplayer-atty_1.1.5.bb | 5 +++-- packages/mplayer/mplayer-common.bb | 31 ++++++++++++++++++++++++++ packages/mplayer/mplayer-common/.mtn2git_empty | 0 packages/mplayer/mplayer-common/mplayer.conf | 15 +++++++++++++ packages/mplayer/mplayer_1.0pre7.bb | 5 +++-- 5 files changed, 52 insertions(+), 4 deletions(-) create mode 100644 packages/mplayer/mplayer-common.bb create mode 100644 packages/mplayer/mplayer-common/.mtn2git_empty create mode 100644 packages/mplayer/mplayer-common/mplayer.conf diff --git a/packages/mplayer/mplayer-atty_1.1.5.bb b/packages/mplayer/mplayer-atty_1.1.5.bb index 5a8194b388..cfc8c7a40a 100644 --- a/packages/mplayer/mplayer-atty_1.1.5.bb +++ b/packages/mplayer/mplayer-atty_1.1.5.bb @@ -2,11 +2,12 @@ DESCRIPTION = "Open Source multimedia player." SECTION = "opie/multimedia" PRIORITY = "optional" HOMEPAGE = "http://atty.skr.jp/?Zaurus%2Fmplayer" -DEPENDS = "virtual/libsdl freetype libmad libogg libvorbis zlib libpng jpeg alsa-lib" +DEPENDS = "virtual/libsdl freetype libmad libogg libvorbis zlib libpng jpeg alsa-lib mplayer-common" +RDEPENDS = "mplayer-common" LICENSE = "GPL" RCONFLICTS = "mplayer" MAINTAINER = "Graeme Gregory " -PR = "r4" +PR = "r5" SRC_URI = "http://www.xora.org.uk/oe/mplayer-${PV}.tar.gz \ file://Makefile.patch;patch=1;pnum=0 \ diff --git a/packages/mplayer/mplayer-common.bb b/packages/mplayer/mplayer-common.bb new file mode 100644 index 0000000000..93ddc975b9 --- /dev/null +++ b/packages/mplayer/mplayer-common.bb @@ -0,0 +1,31 @@ +# +# Copyright Matthias Hentges (c) 2006 +# License: GPL (see http://www.gnu.org/licenses/gpl.txt for a copy of the license) +# +# Filename: mplayer-common.bb +# Date: 26-Mar-06 + +DESCRIPTION = "Preconfigured mplayer preferences" +MAINTAINER = "Matthias 'CoreDump' Hentges " +HOMEPAGE = "http://www.hentges.net/misc/openzaurus/index.shtml" + +###################################################################################### + +PV = "0.0.1" +PR = "r0" + +###################################################################################### + +SRC_URI = "file://mplayer.conf" + +###################################################################################### + +FILES_${PN} = "/usr/etc/mplayer" + +###################################################################################### + +do_install() { + install -d "${D}/usr/etc/mplayer" + + install -m 0644 ${WORKDIR}/mplayer.conf "${D}/usr/etc/mplayer" +} diff --git a/packages/mplayer/mplayer-common/.mtn2git_empty b/packages/mplayer/mplayer-common/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/mplayer/mplayer-common/mplayer.conf b/packages/mplayer/mplayer-common/mplayer.conf new file mode 100644 index 0000000000..92aeb15f3b --- /dev/null +++ b/packages/mplayer/mplayer-common/mplayer.conf @@ -0,0 +1,15 @@ + +# You probably shouldn't touch these +ac=mad, +ao=oss, + +# Required on SL-Cxxxx for correct rotation in the *VT*, +# breaks rotation in X! +# vf=rotate=1 + +# Enable fullscreen display by default +# fs=true + +# Drop frames to keep audio and video in sync +framedrop=true + diff --git a/packages/mplayer/mplayer_1.0pre7.bb b/packages/mplayer/mplayer_1.0pre7.bb index bb9f540ab5..5413ab214c 100644 --- a/packages/mplayer/mplayer_1.0pre7.bb +++ b/packages/mplayer/mplayer_1.0pre7.bb @@ -2,7 +2,8 @@ DESCRIPTION = "Open Source multimedia player." SECTION = "opie/multimedia" PRIORITY = "optional" HOMEPAGE = "http://www.mplayerhq.hu/" -DEPENDS = "virtual/libsdl libmad libogg libvorbis zlib libpng jpeg" +DEPENDS = "virtual/libsdl libmad libogg libvorbis zlib libpng jpeg mplayer-common" +RDEPENDS = "mplayer-common" LICENSE = "GPL" SRC_URI = "http://www1.mplayerhq.hu/MPlayer/releases/MPlayer-${PV}.tar.bz2 \ file://Makefile.patch;patch=1 \ @@ -14,7 +15,7 @@ SRC_URI = "http://www1.mplayerhq.hu/MPlayer/releases/MPlayer-${PV}.tar.bz2 \ MAINTAINER="Graeme Gregory " RCONFLICTS_${PN} = "mplayer-atty" -PR = "r2" +PR = "3" PARALLEL_MAKE = "" -- cgit v1.2.3 From 2e800e9a80e955eef6ce9cd1c37eff28477acc8d Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Sun, 26 Mar 2006 17:00:17 +0000 Subject: libupnp: add 1.3.1 --- packages/upnp/.mtn2git_empty | 0 packages/upnp/libupnp_1.3.1.bb | 16 ++++++++++++++++ 2 files changed, 16 insertions(+) create mode 100644 packages/upnp/.mtn2git_empty create mode 100644 packages/upnp/libupnp_1.3.1.bb diff --git a/packages/upnp/.mtn2git_empty b/packages/upnp/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/upnp/libupnp_1.3.1.bb b/packages/upnp/libupnp_1.3.1.bb new file mode 100644 index 0000000000..80f0999dd6 --- /dev/null +++ b/packages/upnp/libupnp_1.3.1.bb @@ -0,0 +1,16 @@ +DESCRIPTION = "The Linux* SDK for UPnP* Devices (libupnp) provides developers with an API and open source code for building control points, devices, and bridges that are compliant with Version 1.0 of the Universal Plug and Play Device Architecture Specification." +HOMEPAGE = "http://upnp.sourceforge.net/" +MAINTAINER = "Koen Kooi " +LICENSE = "BSD" + +LEAD_SONAME = "libupnp" +SRC_URI = "${SOURCEFORGE_MIRROR}/upnp/${P}.tar.gz" +inherit autotools pkgconfig + + + +do_stage() { +autotools_stage_all +} + + -- cgit v1.2.3 From 1ef446cdda1c68095abca7a730c906305bfc20c7 Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Sun, 26 Mar 2006 17:32:25 +0000 Subject: libetpan: add 0.43, remove 0.36 --- packages/libetpan/files/.mtn2git_empty | 0 packages/libetpan/files/etpan_suffix.patch | 16 ++ packages/libetpan/libetpan-0.36/.mtn2git_empty | 0 .../libetpan/libetpan-0.36/etpan_configure.patch | 55 ------ packages/libetpan/libetpan-0.36/gnutls.patch | 214 --------------------- packages/libetpan/libetpan-0.36/reentrant.patch | 63 ------ packages/libetpan/libetpan-0.38/.mtn2git_empty | 0 packages/libetpan/libetpan-0.38/etpan_suffix.patch | 16 -- packages/libetpan/libetpan_0.36.bb | 24 --- packages/libetpan/libetpan_0.43.bb | 21 ++ 10 files changed, 37 insertions(+), 372 deletions(-) create mode 100644 packages/libetpan/files/.mtn2git_empty create mode 100644 packages/libetpan/files/etpan_suffix.patch delete mode 100644 packages/libetpan/libetpan-0.36/.mtn2git_empty delete mode 100644 packages/libetpan/libetpan-0.36/etpan_configure.patch delete mode 100644 packages/libetpan/libetpan-0.36/gnutls.patch delete mode 100644 packages/libetpan/libetpan-0.36/reentrant.patch delete mode 100644 packages/libetpan/libetpan-0.38/.mtn2git_empty delete mode 100644 packages/libetpan/libetpan-0.38/etpan_suffix.patch delete mode 100644 packages/libetpan/libetpan_0.36.bb create mode 100644 packages/libetpan/libetpan_0.43.bb diff --git a/packages/libetpan/files/.mtn2git_empty b/packages/libetpan/files/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/libetpan/files/etpan_suffix.patch b/packages/libetpan/files/etpan_suffix.patch new file mode 100644 index 0000000000..901615c416 --- /dev/null +++ b/packages/libetpan/files/etpan_suffix.patch @@ -0,0 +1,16 @@ + +# +# Patch managed by http://www.holgerschurig.de/patcher.html +# + +--- libetpan/configure.in~etpan_suffix ++++ libetpan/configure.in +@@ -371,7 +371,7 @@ + REENTRANT=1 + else + REENTRANT=0 +- LIBSUFFIX=-no-mt ++ LIBSUFFIX= + fi + AC_SUBST(LIBSUFFIX) + AC_SUBST(REENTRANT) diff --git a/packages/libetpan/libetpan-0.36/.mtn2git_empty b/packages/libetpan/libetpan-0.36/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/libetpan/libetpan-0.36/etpan_configure.patch b/packages/libetpan/libetpan-0.36/etpan_configure.patch deleted file mode 100644 index 3572339010..0000000000 --- a/packages/libetpan/libetpan-0.36/etpan_configure.patch +++ /dev/null @@ -1,55 +0,0 @@ - -# -# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher -# - ---- libetpan/configure.in~etpan_configure 2005-03-10 10:11:29.000000000 +0100 -+++ libetpan/configure.in 2005-03-11 13:57:00.232491234 +0100 -@@ -76,6 +76,38 @@ - esac - fi - -+dnl GNUTLS -+AC_ARG_WITH(gnutls, [ --with-gnutls[=DIR] include GnuTLS support (default=no)], -+ [], [with_gnutls=no]) -+if test "x$with_gnutls" != "xno"; then -+ OCPPFLAGS="$CPPFLAGS" -+ OLDFLAGS="$LDFLAGS" -+ if test "x$with_gnutls" != "xyes" ; then -+ CPPFLAGS="CRPPFLAGS -I$with_gnutls/include" -+ LDFLAGS="$LDFLAGS -L$with_gnutls/lib" -+ fi -+ GNUTLSLIBS="" -+ AC_CHECK_HEADER(gnutls/gnutls.h, [ -+ AC_CHECK_LIB(gnutls, gnutls_global_deinit, with_gnutls=yes,[GNUTLSLIBS="-lgnutls -lgnutls-openssl"]) -+ ]) -+ if test "x$with_gnutls" != "xyes"; then -+ CPPFLAGS="$OCPPFLAGS" -+ LDFLAGS="$OLDFLAGS" -+ else -+ with_openssl="no" -+ fi -+fi -+ -+if test "x$with_gnutls" = "xyes"; then -+ AC_DEFINE([USE_GNUTLS],1, [Define to use GnuTLS]) -+ AC_DEFINE([USE_SSL], 1, [Define to use OpenSSL]) -+ GNUTLSLIBS="-lgnutls -lgnutls-openssl" -+else -+ AC_MSG_WARN([GnuTLS support disabled.]) -+ GNUTLSLIBS="" -+fi -+AC_SUBST(GNUTLSLIBS) -+ - dnl OpenSSL -- very primitive right now - AC_ARG_WITH(openssl, [ --with-openssl[=DIR] include OpenSSL support (default=auto)], - [], [with_openssl=yes]) -@@ -336,7 +368,7 @@ - REENTRANT=1 - else - REENTRANT=0 -- LIBSUFFIX=-no-mt -+ LIBSUFFIX= - fi - AC_SUBST(LIBSUFFIX) - AC_SUBST(REENTRANT) diff --git a/packages/libetpan/libetpan-0.36/gnutls.patch b/packages/libetpan/libetpan-0.36/gnutls.patch deleted file mode 100644 index d2ccdcf9d0..0000000000 --- a/packages/libetpan/libetpan-0.36/gnutls.patch +++ /dev/null @@ -1,214 +0,0 @@ - -# -# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher -# - ---- libetpan/src/Makefile.in~gnutls 2005-03-10 10:11:30.000000000 +0100 -+++ libetpan/src/Makefile.in 2005-03-11 21:43:10.975597607 +0100 -@@ -15,7 +15,7 @@ - - VERSINFO = @API_VERSION@ - CC = @CC@ --LDFLAGS = @LIBS@ @SSLLIBS@ @LDFLAGS@ @DBLIB@ -+LDFLAGS = @LIBS@ @SSLLIBS@ @LDFLAGS@ @DBLIB@ @GNUTLSLIBS@ - - SUBLIBS = data-types/libdata-types.la \ - low-level/liblow-level.la \ ---- libetpan/src/data-types/mailstream_ssl.c~gnutls 2005-03-10 10:11:30.000000000 +0100 -+++ libetpan/src/data-types/mailstream_ssl.c 2005-03-11 21:44:56.373673788 +0100 -@@ -61,7 +61,12 @@ - /* mailstream_low, ssl */ - - #ifdef USE_SSL -+#ifndef USE_GNUTLS - #include -+#else -+#include -+#include -+#endif - #ifdef LIBETPAN_REENTRANT - #include - #endif -@@ -85,9 +90,9 @@ - #ifdef USE_SSL - static int mailstream_low_ssl_close(mailstream_low * s); - static ssize_t mailstream_low_ssl_read(mailstream_low * s, -- void * buf, size_t count); -+ void * buf, size_t count); - static ssize_t mailstream_low_ssl_write(mailstream_low * s, -- const void * buf, size_t count); -+ const void * buf, size_t count); - static void mailstream_low_ssl_free(mailstream_low * s); - static int mailstream_low_ssl_get_fd(mailstream_low * s); - -@@ -113,10 +118,10 @@ - SSL_CTX * tmp_ctx; - int fd_flags; - int old_fd_flags; -- -+ - #ifdef LIBETPAN_REENTRANT - pthread_mutex_lock(&ssl_lock); --#endif -+#endif - if (!ssl_init_done) { - SSL_library_init(); - ssl_init_done = 1; -@@ -124,35 +129,37 @@ - #ifdef LIBETPAN_REENTRANT - pthread_mutex_unlock(&ssl_lock); - #endif -- -+ - tmp_ctx = SSL_CTX_new(TLSv1_client_method()); - if (tmp_ctx == NULL) - goto err; -- -+ - ssl_conn = (SSL *) SSL_new(tmp_ctx); - if (ssl_conn == NULL) - goto free_ctx; -- -+ - if (SSL_set_fd(ssl_conn, fd) == 0) - goto free_ssl_conn; -- -+ -+#ifndef USE_GNUTLS - SSL_set_read_ahead(ssl_conn, 1); -- -+#endif -+ - r = SSL_connect(ssl_conn); - if (r <= 0) - goto free_ssl_conn; -- -+ - fd_flags = fcntl(fd, F_GETFL, 0); - old_fd_flags = fd_flags; - fd_flags |= O_NDELAY; - r = fcntl(fd, F_SETFL, fd_flags); - if (r < 0) - goto free_ssl_conn; -- -+ - ssl_data = malloc(sizeof(* ssl_data)); - if (ssl_data == NULL) - goto reset_fd_flags; -- -+ - ssl_data->fd = fd; - ssl_data->ssl_conn = ssl_conn; - ssl_data->ssl_ctx = tmp_ctx; -@@ -241,52 +248,101 @@ - } - - static ssize_t mailstream_low_ssl_read(mailstream_low * s, -- void * buf, size_t count) -+ void * buf, size_t count) - { - struct mailstream_ssl_data * ssl_data; - int r; - - ssl_data = (struct mailstream_ssl_data *) s->data; -- -+ - while (1) { - int ssl_r; - fd_set fds_read; -+#ifndef USE_GNUTLS - struct timeval timeout; -- -+#else -+ fd_set fds_excp; -+ -+ { -+ struct timeval timeout2; -+ timeout2 = mailstream_network_delay; -+ -+ FD_ZERO(&fds_read); -+ FD_SET(ssl_data->fd, &fds_read); -+ FD_ZERO(&fds_excp); -+ FD_SET(ssl_data->fd, &fds_excp); -+ r = select(ssl_data->fd + 1, &fds_read, NULL, &fds_excp, &timeout2); -+ if (r==0) { -+ return -1; -+ } -+ if (FD_ISSET(ssl_data->fd, &fds_excp)) -+ return -1; -+ if (!FD_ISSET(ssl_data->fd, &fds_read)) -+ return 0; -+ } -+#endif - r = SSL_read(ssl_data->ssl_conn, buf, count); -- if (r > 0) -+ if (r > 0) { - return r; -- -+ } -+#ifdef USE_GNUTLS -+ if (errno!=EAGAIN&&errno!=EWOULDBLOCK) { -+ return r; -+ } -+#else - ssl_r = SSL_get_error(ssl_data->ssl_conn, r); - switch (ssl_r) { - case SSL_ERROR_NONE: - return r; -- -+ - case SSL_ERROR_ZERO_RETURN: - return r; -- -+ - case SSL_ERROR_WANT_READ: - timeout = mailstream_network_delay; -- -+ - FD_ZERO(&fds_read); - FD_SET(ssl_data->fd, &fds_read); - r = select(ssl_data->fd + 1, &fds_read, NULL, NULL, &timeout); - if (r == 0) - return -1; - break; -- -+ - default: - return r; - } -+#endif - } - } - - static ssize_t mailstream_low_ssl_write(mailstream_low * s, -- const void * buf, size_t count) -+ const void * buf, size_t count) - { - struct mailstream_ssl_data * ssl_data; - - ssl_data = (struct mailstream_ssl_data *) s->data; -+#ifdef USE_GNUTLS -+ { -+ fd_set fds_write; -+ fd_set fds_excp; -+ struct timeval timeout; -+ int r; -+ -+ timeout = mailstream_network_delay; -+ -+ FD_ZERO(&fds_write); -+ FD_SET(ssl_data->fd, &fds_write); -+ FD_ZERO(&fds_excp); -+ FD_SET(ssl_data->fd, &fds_excp); -+ r = select(ssl_data->fd + 1, NULL, &fds_write, &fds_excp, &timeout); -+ if (r == 0) -+ return -1; -+ if (FD_ISSET(ssl_data->fd, &fds_excp)) -+ return -1; -+ if (!FD_ISSET(ssl_data->fd, &fds_write)) -+ return 0; -+ } -+#endif - return SSL_write(ssl_data->ssl_conn, buf, count); - } - #endif diff --git a/packages/libetpan/libetpan-0.36/reentrant.patch b/packages/libetpan/libetpan-0.36/reentrant.patch deleted file mode 100644 index eaf1edfe22..0000000000 --- a/packages/libetpan/libetpan-0.36/reentrant.patch +++ /dev/null @@ -1,63 +0,0 @@ - -# -# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher -# - ---- libetpan/src/data-types/mailsem.c~reentrant 2005-01-28 02:43:11.000000000 +0100 -+++ libetpan/src/data-types/mailsem.c 2005-03-10 14:32:31.717000768 +0100 -@@ -34,7 +34,9 @@ - */ - - #include "mailsem.h" -+#ifdef LIBETPAN_REENTRANT - #include -+#endif - #include - #include - #include -@@ -50,6 +52,7 @@ - - struct mailsem * mailsem_new(void) - { -+#ifdef LIBETPAN_REENTRANT - struct mailsem * sem; - int r; - -@@ -82,11 +85,13 @@ - return sem; - - err: -+#endif - return NULL; - } - - void mailsem_free(struct mailsem * sem) - { -+#ifdef LIBETPAN_REENTRANT - if (sem->sem_kind == SEMKIND_SEMOPEN) { - char name[SEMNAME_LEN]; - -@@ -101,14 +106,23 @@ - free(sem->sem_sem); - } - free(sem); -+#endif - } - - int mailsem_up(struct mailsem * sem) - { -+#ifdef LIBETPAN_REENTRANT - return sem_wait((sem_t *) sem->sem_sem); -+#else -+ return 0; -+#endif - } - - int mailsem_down(struct mailsem * sem) - { -+#ifdef LIBETPAN_REENTRANT - return sem_post((sem_t *) sem->sem_sem); -+#else -+ return 0; -+#endif - } diff --git a/packages/libetpan/libetpan-0.38/.mtn2git_empty b/packages/libetpan/libetpan-0.38/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/libetpan/libetpan-0.38/etpan_suffix.patch b/packages/libetpan/libetpan-0.38/etpan_suffix.patch deleted file mode 100644 index 901615c416..0000000000 --- a/packages/libetpan/libetpan-0.38/etpan_suffix.patch +++ /dev/null @@ -1,16 +0,0 @@ - -# -# Patch managed by http://www.holgerschurig.de/patcher.html -# - ---- libetpan/configure.in~etpan_suffix -+++ libetpan/configure.in -@@ -371,7 +371,7 @@ - REENTRANT=1 - else - REENTRANT=0 -- LIBSUFFIX=-no-mt -+ LIBSUFFIX= - fi - AC_SUBST(LIBSUFFIX) - AC_SUBST(REENTRANT) diff --git a/packages/libetpan/libetpan_0.36.bb b/packages/libetpan/libetpan_0.36.bb deleted file mode 100644 index 1a6c989d5a..0000000000 --- a/packages/libetpan/libetpan_0.36.bb +++ /dev/null @@ -1,24 +0,0 @@ -DESCRIPTION = "libetpan is a library for communicating with mail and news servers using \ -SMTP, POP, IMAP and NNTP" -SECTION = "libs" -DEPENDS = "openssl" -PV = "0.36" -PR = "r3" -S = "${WORKDIR}/libetpan" -TAG="rel-0-36" -LICENSE = "BSD" -SRC_URI = "cvs://anonymous@cvs.sourceforge.net/cvsroot/libetpan;tag=${TAG};module=libetpan \ - file://etpan_configure.patch;patch=1 \ - file://reentrant.patch;patch=1 \ - file://gnutls.patch;patch=1 " - -inherit autotools pkgconfig gettext - -EXTRA_OECONF = "--with-openssl=${STAGING_LIBDIR}/.. --disable-db --disable-threads" - -do_stage () { - oe_runmake install includedir=${STAGING_INCDIR} libdir=${STAGING_LIBDIR} bindir=${STAGING_BINDIR} -} - -FILES_${PN} = "${libdir}/lib*.so.*" -FILES_${PN}-dev = "${bindir} ${includedir} ${libdir}/lib*.so ${libdir}/*.la ${libdir}/*.a ${libdir}/pkgconfig" diff --git a/packages/libetpan/libetpan_0.43.bb b/packages/libetpan/libetpan_0.43.bb new file mode 100644 index 0000000000..51757a7265 --- /dev/null +++ b/packages/libetpan/libetpan_0.43.bb @@ -0,0 +1,21 @@ +DESCRIPTION = "libetpan is a library for communicating with mail and news servers. \ +It supports the protocols SMTP, POP3, IMAP and NNTP." +HOMEPAGE = "http://www.etpan.org" +SECTION = "libs" +DEPENDS = "gnutls" +LICENSE = "BSD" +PR = "r0" + +SRC_URI = "${SOURCEFORGE_MIRROR}/libetpan/libetpan-${PV}.tar.gz \ + file://etpan_suffix.patch;patch=1 " + +inherit autotools pkgconfig gettext + +EXTRA_OECONF = "--without-openssl --with-gnutls --disable-db --disable-threads" + +do_stage() { + oe_runmake install includedir=${STAGING_INCDIR} libdir=${STAGING_LIBDIR} bindir=${STAGING_BINDIR} +} + +FILES_${PN} = "${libdir}/lib*.so.*" +FILES_${PN}-dev = "${bindir} ${includedir} ${libdir}/lib*.so ${libdir}/*.la ${libdir}/*.a ${libdir}/pkgconfig" -- cgit v1.2.3 From 2189026ab46306001c2f809c3f4c504dea11394c Mon Sep 17 00:00:00 2001 From: Joseph Cole Date: Sun, 26 Mar 2006 19:04:11 +0000 Subject: Add a couple of 64-bit buildhost cleanup patches to the tree, but do not use them yet. These need to be further tested by devs with ia32 buildhost, and activated by uicmoc maintainer. Thanks to Darren Edmundson for patches (OE bugs #345, #535). --- .../uicmoc-native-2.3.10/use_stdint_types.patch | 226 +++++++++++++++++++++ .../uicmoc3-native-3.3.5/use_stdint_types.patch | 147 ++++++++++++++ 2 files changed, 373 insertions(+) create mode 100644 packages/uicmoc/uicmoc-native-2.3.10/use_stdint_types.patch create mode 100644 packages/uicmoc/uicmoc3-native-3.3.5/use_stdint_types.patch diff --git a/packages/uicmoc/uicmoc-native-2.3.10/use_stdint_types.patch b/packages/uicmoc/uicmoc-native-2.3.10/use_stdint_types.patch new file mode 100644 index 0000000000..3cca3e0d1d --- /dev/null +++ b/packages/uicmoc/uicmoc-native-2.3.10/use_stdint_types.patch @@ -0,0 +1,226 @@ +--- qt-2.3.10/src/kernel/qsharedmemory.cpp~64bit 2005-12-14 12:31:39.000000000 +0000 ++++ qt-2.3.10/src/kernel/qsharedmemory.cpp 2005-12-14 13:24:41.000000000 +0000 +@@ -36,6 +36,7 @@ + + #include + #include ++#include + + #if defined(QT_POSIX_QSHM) + #include +@@ -122,8 +123,8 @@ + if (shmId == -1) + shmId = shmget (key, shmSize, 0); + +- shmBase = shmat (shmId, 0, 0); +- if ((int) shmBase == -1 || shmBase == 0) ++ intptr_t shmBase = (intptr_t) shmat (shmId, 0, 0); ++ if (shmBase == -1 || shmBase == 0) + return FALSE; + else + return TRUE; +--- qt-2.3.10/src/kernel/qapplication_qws.cpp~64bit 2005-12-14 12:15:42.000000000 +0000 ++++ qt-2.3.10/src/kernel/qapplication_qws.cpp 2005-12-14 12:19:39.000000000 +0000 +@@ -87,6 +87,7 @@ + #include + #include + #include ++#include + #endif + + #include +@@ -2041,7 +2042,7 @@ + w = widgetAt(*qt_last_x, *qt_last_y, FALSE); + if ( !w ) + w = desktop(); +- QPaintDevice::qwsDisplay()->selectCursor(w, (int)app_cursor->handle()); ++ QPaintDevice::qwsDisplay()->selectCursor(w, (intptr_t)app_cursor->handle()); + } + + void QApplication::restoreOverrideCursor() +@@ -2060,11 +2061,11 @@ + cursorStack = 0; + qws_overrideCursor = FALSE; + if ( w->testWState(WState_OwnCursor) ) +- QPaintDevice::qwsDisplay()->selectCursor(w, (int)w->cursor().handle()); ++ QPaintDevice::qwsDisplay()->selectCursor(w, (intptr_t)w->cursor().handle()); + else + QPaintDevice::qwsDisplay()->selectCursor(w, ArrowCursor); + } else { +- QPaintDevice::qwsDisplay()->selectCursor(w, (int)app_cursor->handle()); ++ QPaintDevice::qwsDisplay()->selectCursor(w, (intptr_t)app_cursor->handle()); + } + } + #endif// QT_NO_CURSOR +@@ -2635,7 +2636,7 @@ + } + if ( !qws_overrideCursor ) { // is override cursor active? + if (curs) +- QPaintDevice::qwsDisplay()->selectCursor(widget, (int)curs->handle()); ++ QPaintDevice::qwsDisplay()->selectCursor(widget, (intptr_t)curs->handle()); + else + QPaintDevice::qwsDisplay()->selectCursor(widget, ArrowCursor); + } +--- qt-2.3.10/src/kernel/qgfxlinuxfb_qws.cpp~64bit 2005-01-23 14:00:46.000000000 +0000 ++++ qt-2.3.10/src/kernel/qgfxlinuxfb_qws.cpp 2005-12-14 12:04:56.000000000 +0000 +@@ -42,6 +42,7 @@ + #include + #include + #include ++#include + + #include "qgfxlinuxfb_qws.h" + #include "qwindowsystem_qws.h" +@@ -164,7 +165,7 @@ + MAP_SHARED, fd, 0); + data += dataoffset; + +- if ((int)data == -1) { ++ if ((intptr_t)data == -1) { + perror("mapping /dev/fb0"); + qWarning("Error: failed to map framebuffer device to memory."); + return FALSE; +@@ -703,7 +704,7 @@ + psize += 8; // for alignment + psize &= ~0x7; // align + +- unsigned int pos=(unsigned int)data; ++ uintptr_t pos=(uintptr_t)data; + pos += psize; + entryp = ((int *)pos); + lowest = ((unsigned int *)pos)+1; +--- qt-2.3.10/src/kernel/qmemorymanager_qws.h~64bit 2005-01-23 14:00:46.000000000 +0000 ++++ qt-2.3.10/src/kernel/qmemorymanager_qws.h 2005-12-14 12:00:32.000000000 +0000 +@@ -33,6 +33,9 @@ + #ifndef QMEMORYMANAGER_H + #define QMEMORYMANAGER_H + ++/* Needed for uintptr_t to allow 64bit clean pointer handling */ ++#include ++ + #ifndef QT_H + #include + #include +@@ -126,8 +129,8 @@ + // constructs from a memory ptr to where the data after the item starts + QSMCacheItemPtr(void *data) { + char *ptr = (char*)data; +- if ( (int)ptr != (((int)ptr+3)&~3) ) +- qDebug("err, passed a non-aligned data ptr %x", (int)ptr); ++ if (intptr_t(data)&3!=0) ++ qDebug("err, passed a non-aligned data ptr %p", ptr); + d = (QSMCacheItem*)(ptr - sizeof(QSMCacheItem)); + } + // returns a pointer to the data after the item +--- qt-2.3.10/src/kernel/qwsregionmanager_qws.cpp~64bit 2005-12-14 13:25:06.000000000 +0000 ++++ qt-2.3.10/src/kernel/qwsregionmanager_qws.cpp 2005-12-14 13:25:51.000000000 +0000 +@@ -32,6 +32,7 @@ + #include "qwsdisplay_qws.h" + #include "qwsregionmanager_qws.h" + #include ++#include + + #ifndef QT_NO_QWS_MULTIPROCESS + #include +@@ -286,7 +287,7 @@ + data = (unsigned char *)shmat( shmId, 0, SHM_RDONLY ); + } + +- return ( shmId != -1 && (int)data != -1 ); ++ return ( shmId != -1 && (intptr_t)data != -1 ); + #else + int dataSize = sizeof(QWSRegionHeader) // header + + sizeof(QWSRegionIndex) * QT_MAX_REGIONS // + index +--- qt-2.3.10/src/kernel/qpixmapcache.cpp~64bit 2005-12-14 13:26:43.000000000 +0000 ++++ qt-2.3.10/src/kernel/qpixmapcache.cpp 2005-12-14 13:30:33.000000000 +0000 +@@ -38,6 +38,7 @@ + #include "qpixmapcache.h" + #include "qcache.h" + #include "qobject.h" ++#include + + + // REVISED: paul +@@ -519,7 +520,7 @@ + #endif // DEBUG_SHARED_MEMORY_CACHE + } + +- if ( shmId == -1 || (int)shm == -1 ) ++ if ( shmId == -1 || (intptr_t)shm == -1 ) + qFatal("Cannot attach to shared memory"); + + qt_sharedMemoryData = shm->data; +@@ -536,8 +537,8 @@ + shm->tail.setFree(false); + shm->tail.setNextFree(QSMemPtr()); + #ifdef THROW_AWAY_UNUSED_PAGES +- int freePageStart = PAGE_ALIGN((int)&shm->first + sizeof(QSMemNode)); +- int freePagesLength = PAGE_ALIGN((int)&shm->tail) - freePageStart; ++ intptr_t freePageStart = PAGE_ALIGN((intptr_t)&shm->first + sizeof(QSMemNode)); ++ intptr_t freePagesLength = PAGE_ALIGN((intptr_t)&shm->tail) - freePageStart; + if ( freePagesLength ) { + # ifdef DEBUG_SHARED_MEMORY_CACHE + qDebug("Initially marking free pages as not needed"); +@@ -770,8 +771,8 @@ + node = newFreeNode->next(); + + #ifdef THROW_AWAY_UNUSED_PAGES +- int freePageStart = PAGE_ALIGN((int)newFreeNode+sizeof(QSMemNode)); +- int freePagesLength = PAGE_ALIGN((int)node) - freePageStart; ++ intptr_t freePageStart = PAGE_ALIGN((intptr_t)newFreeNode+sizeof(QSMemNode)); ++ intptr_t freePagesLength = PAGE_ALIGN((intptr_t)node) - freePageStart; + if ( freePagesLength ) { + #ifdef DEBUG_SHARED_MEMORY_CACHE + qDebug("Marking pages not needed"); +--- qt-2.3.10/src/kernel/qwidget_qws.cpp~64bit 2005-12-14 12:20:46.000000000 +0000 ++++ qt-2.3.10/src/kernel/qwidget_qws.cpp 2005-12-14 12:30:35.000000000 +0000 +@@ -50,6 +50,7 @@ + #include "qwsmanager_qws.h" + #include "qwsregionmanager_qws.h" + #include "qinputcontext_p.h" ++#include + + void qt_insert_sip( QWidget*, int, int ); // defined in qapplication_x11.cpp + int qt_sip_count( QWidget* ); // --- "" --- +@@ -633,7 +634,7 @@ + qt_mouseGrb->releaseMouse(); + + qwsDisplay()->grabMouse(this,TRUE); +- qwsDisplay()->selectCursor(this, (unsigned int)cursor.handle()); ++ qwsDisplay()->selectCursor(this, (uintptr_t)cursor.handle()); + qt_mouseGrb = this; + qt_pressGrab = 0; + } +@@ -1840,11 +1841,11 @@ + void QWidget::updateCursor( const QRegion &r ) const + { + if ( qt_last_x && (!QWidget::mouseGrabber() || QWidget::mouseGrabber() == this) && +- qt_last_cursor != (WId)cursor().handle() && !qws_overrideCursor ) { ++ qt_last_cursor != (uintptr_t)cursor().handle() && !qws_overrideCursor ) { + QSize s( qt_screen->width(), qt_screen->height() ); + QPoint pos = qt_screen->mapToDevice(QPoint(*qt_last_x, *qt_last_y), s); + if ( r.contains(pos) ) +- qwsDisplay()->selectCursor((QWidget*)this, (unsigned int)cursor().handle()); ++ qwsDisplay()->selectCursor((QWidget*)this, (uintptr_t)cursor().handle()); + } + } + #endif +--- qt-2.3.10/tools/qvfb/qvfbview.cpp~64bit 2005-12-14 13:32:47.000000000 +0000 ++++ qt-2.3.10/tools/qvfb/qvfbview.cpp 2005-12-14 13:33:27.000000000 +0000 +@@ -40,6 +40,7 @@ + #include + #include + #include ++#include + + + QVFbView::QVFbView( int display_id, int _w, int _h, int d, Rotation r, QWidget *parent, +@@ -136,7 +137,7 @@ + data = (unsigned char *)shmat( shmId, 0, 0 ); + } + +- if ( (int)data == -1 ){ ++ if ( (intptr_t)data == -1 ){ + ::close(mouseFd); + ::close(keyboardFd); + qFatal( "Cannot attach to shared memory %d",shmId ); diff --git a/packages/uicmoc/uicmoc3-native-3.3.5/use_stdint_types.patch b/packages/uicmoc/uicmoc3-native-3.3.5/use_stdint_types.patch new file mode 100644 index 0000000000..17836802a6 --- /dev/null +++ b/packages/uicmoc/uicmoc3-native-3.3.5/use_stdint_types.patch @@ -0,0 +1,147 @@ +--- qt-embedded-free-3.3.5/src/embedded/qgfxlinuxfb_qws.cpp~64bit 2005-12-14 15:51:23.000000000 +0000 ++++ qt-embedded-free-3.3.5/src/embedded/qgfxlinuxfb_qws.cpp 2005-12-14 15:52:29.000000000 +0000 +@@ -176,7 +176,7 @@ + MAP_SHARED, fd, 0); + data += dataoffset; + +- if ((int)data == -1) { ++ if ((intptr_t)data == -1) { + perror("mapping /dev/fb0"); + qWarning("Error: failed to map framebuffer device to memory."); + return FALSE; +@@ -737,7 +737,7 @@ + psize += 8; // for alignment + psize &= ~0x7; // align + +- unsigned int pos=(unsigned int)data; ++ uintptr_t pos=(uintptr_t)data; + pos += psize; + entryp = ((int *)pos); + lowest = ((unsigned int *)pos)+1; +--- qt-embedded-free-3.3.5/src/kernel/qsharedmemory_p.cpp~64bit 2005-12-14 15:34:43.000000000 +0000 ++++ qt-embedded-free-3.3.5/src/kernel/qsharedmemory_p.cpp 2005-12-14 15:35:26.000000000 +0000 +@@ -31,6 +31,7 @@ + **********************************************************************/ + + #include "qsharedmemory_p.h" ++#include + + #if !defined(QT_QWS_NO_SHM) + +@@ -132,7 +133,7 @@ + shmId = shmget (key, shmSize, 0); + + shmBase = shmat (shmId, 0, 0); +- if ((int) shmBase == -1 || shmBase == 0) ++ if ((intptr_t) shmBase == -1 || shmBase == 0) + return FALSE; + else + return TRUE; +--- qt-embedded-free-3.3.5/src/kernel/qapplication_qws.cpp~64bit 2005-12-14 15:27:14.000000000 +0000 ++++ qt-embedded-free-3.3.5/src/kernel/qapplication_qws.cpp 2005-12-14 15:28:37.000000000 +0000 +@@ -107,6 +107,7 @@ + #include + #include + #include ++#include + + #if defined(Q_OS_QNX) + #include +@@ -1879,7 +1880,7 @@ + w = widgetAt(*qt_last_x, *qt_last_y, FALSE); + if ( !w ) + w = desktop(); +- QPaintDevice::qwsDisplay()->selectCursor(w, (int)app_cursor->handle()); ++ QPaintDevice::qwsDisplay()->selectCursor(w, (intptr_t)app_cursor->handle()); + } + + void QApplication::restoreOverrideCursor() +@@ -1898,11 +1899,11 @@ + cursorStack = 0; + qws_overrideCursor = FALSE; + if ( w->testWState(WState_OwnCursor) ) +- QPaintDevice::qwsDisplay()->selectCursor(w, (int)w->cursor().handle()); ++ QPaintDevice::qwsDisplay()->selectCursor(w, (intptr_t)w->cursor().handle()); + else + QPaintDevice::qwsDisplay()->selectCursor(w, ArrowCursor); + } else { +- QPaintDevice::qwsDisplay()->selectCursor(w, (int)app_cursor->handle()); ++ QPaintDevice::qwsDisplay()->selectCursor(w, (intptr_t)app_cursor->handle()); + } + } + #endif// QT_NO_CURSOR +@@ -2130,7 +2131,7 @@ + } + if ( !qws_overrideCursor ) { + if (curs) +- QPaintDevice::qwsDisplay()->selectCursor(widget, (int)curs->handle()); ++ QPaintDevice::qwsDisplay()->selectCursor(widget, (intptr_t)curs->handle()); + else + QPaintDevice::qwsDisplay()->selectCursor(widget, ArrowCursor); + } +--- qt-embedded-free-3.3.5/src/kernel/qfont_qws.cpp~64bit 2005-12-14 15:29:17.000000000 +0000 ++++ qt-embedded-free-3.3.5/src/kernel/qfont_qws.cpp 2005-12-14 15:29:54.000000000 +0000 +@@ -49,6 +49,7 @@ + #include "qgfx_qws.h" + #include "qtextengine_p.h" + #include "qfontengine_p.h" ++#include + + QFont::Script QFontPrivate::defaultScript = QFont::UnknownScript; + +@@ -133,7 +134,7 @@ + req.pointSize = req.pixelSize*10; + + if ( ! engineData ) { +- QFontCache::Key key( req, QFont::NoScript, (int)paintdevice ); ++ QFontCache::Key key( req, QFont::NoScript, (intptr_t)paintdevice ); + + // look for the requested font in the engine data cache + engineData = QFontCache::instance->findEngineData( key ); +--- qt-embedded-free-3.3.5/src/kernel/qwsregionmanager_qws.cpp~64bit 2005-12-14 15:32:12.000000000 +0000 ++++ qt-embedded-free-3.3.5/src/kernel/qwsregionmanager_qws.cpp 2005-12-14 15:32:52.000000000 +0000 +@@ -32,6 +32,7 @@ + #include "qwsdisplay_qws.h" + #include "qwsregionmanager_qws.h" + #include ++#include + + #ifndef QT_NO_QWS_MULTIPROCESS + #include +@@ -288,7 +289,7 @@ + data = (unsigned char *)shmat( shmId, 0, 0 ); + } + +- return ( shmId != -1 && (int)data != -1 ); ++ return ( shmId != -1 && (intptr_t)data != -1 ); + #else + int dataSize = sizeof(QWSRegionHeader) // header + + sizeof(QWSRegionIndex) * QT_MAX_REGIONS // + index +--- qt-embedded-free-3.3.5/src/kernel/qwidget_qws.cpp~64bit 2005-12-14 15:30:36.000000000 +0000 ++++ qt-embedded-free-3.3.5/src/kernel/qwidget_qws.cpp 2005-12-14 15:31:37.000000000 +0000 +@@ -53,6 +53,7 @@ + #include "qwsmanager_qws.h" + #include "qwsregionmanager_qws.h" + #include "qinputcontext_p.h" ++#include + + void qt_insert_sip( QWidget*, int, int ); // defined in qapplication_x11.cpp + int qt_sip_count( QWidget* ); // --- "" --- +@@ -631,7 +632,7 @@ + qt_mouseGrb->releaseMouse(); + + qwsDisplay()->grabMouse(this,TRUE); +- qwsDisplay()->selectCursor(this, (unsigned int)cursor.handle()); ++ qwsDisplay()->selectCursor(this, (uintptr_t)cursor.handle()); + qt_mouseGrb = this; + qt_pressGrab = 0; + } +@@ -1845,7 +1846,7 @@ + QSize s( qt_screen->width(), qt_screen->height() ); + QPoint pos = qt_screen->mapToDevice(QPoint(*qt_last_x, *qt_last_y), s); + if ( r.contains(pos) ) +- qwsDisplay()->selectCursor((QWidget*)this, (unsigned int)cursor().handle()); ++ qwsDisplay()->selectCursor((QWidget*)this, (uintptr_t)cursor().handle()); + } + } + #endif -- cgit v1.2.3 From df2a64dbc7fe5e334cac55a628a2785280eb90de Mon Sep 17 00:00:00 2001 From: Joseph Cole Date: Sun, 26 Mar 2006 19:10:26 +0000 Subject: disapproval of revision '028a611cef6b234bc056ae3e11b0b983d6762f4e' --- .../uicmoc-native-2.3.10/use_stdint_types.patch | 226 --------------------- .../uicmoc3-native-3.3.5/use_stdint_types.patch | 147 -------------- 2 files changed, 373 deletions(-) delete mode 100644 packages/uicmoc/uicmoc-native-2.3.10/use_stdint_types.patch delete mode 100644 packages/uicmoc/uicmoc3-native-3.3.5/use_stdint_types.patch diff --git a/packages/uicmoc/uicmoc-native-2.3.10/use_stdint_types.patch b/packages/uicmoc/uicmoc-native-2.3.10/use_stdint_types.patch deleted file mode 100644 index 3cca3e0d1d..0000000000 --- a/packages/uicmoc/uicmoc-native-2.3.10/use_stdint_types.patch +++ /dev/null @@ -1,226 +0,0 @@ ---- qt-2.3.10/src/kernel/qsharedmemory.cpp~64bit 2005-12-14 12:31:39.000000000 +0000 -+++ qt-2.3.10/src/kernel/qsharedmemory.cpp 2005-12-14 13:24:41.000000000 +0000 -@@ -36,6 +36,7 @@ - - #include - #include -+#include - - #if defined(QT_POSIX_QSHM) - #include -@@ -122,8 +123,8 @@ - if (shmId == -1) - shmId = shmget (key, shmSize, 0); - -- shmBase = shmat (shmId, 0, 0); -- if ((int) shmBase == -1 || shmBase == 0) -+ intptr_t shmBase = (intptr_t) shmat (shmId, 0, 0); -+ if (shmBase == -1 || shmBase == 0) - return FALSE; - else - return TRUE; ---- qt-2.3.10/src/kernel/qapplication_qws.cpp~64bit 2005-12-14 12:15:42.000000000 +0000 -+++ qt-2.3.10/src/kernel/qapplication_qws.cpp 2005-12-14 12:19:39.000000000 +0000 -@@ -87,6 +87,7 @@ - #include - #include - #include -+#include - #endif - - #include -@@ -2041,7 +2042,7 @@ - w = widgetAt(*qt_last_x, *qt_last_y, FALSE); - if ( !w ) - w = desktop(); -- QPaintDevice::qwsDisplay()->selectCursor(w, (int)app_cursor->handle()); -+ QPaintDevice::qwsDisplay()->selectCursor(w, (intptr_t)app_cursor->handle()); - } - - void QApplication::restoreOverrideCursor() -@@ -2060,11 +2061,11 @@ - cursorStack = 0; - qws_overrideCursor = FALSE; - if ( w->testWState(WState_OwnCursor) ) -- QPaintDevice::qwsDisplay()->selectCursor(w, (int)w->cursor().handle()); -+ QPaintDevice::qwsDisplay()->selectCursor(w, (intptr_t)w->cursor().handle()); - else - QPaintDevice::qwsDisplay()->selectCursor(w, ArrowCursor); - } else { -- QPaintDevice::qwsDisplay()->selectCursor(w, (int)app_cursor->handle()); -+ QPaintDevice::qwsDisplay()->selectCursor(w, (intptr_t)app_cursor->handle()); - } - } - #endif// QT_NO_CURSOR -@@ -2635,7 +2636,7 @@ - } - if ( !qws_overrideCursor ) { // is override cursor active? - if (curs) -- QPaintDevice::qwsDisplay()->selectCursor(widget, (int)curs->handle()); -+ QPaintDevice::qwsDisplay()->selectCursor(widget, (intptr_t)curs->handle()); - else - QPaintDevice::qwsDisplay()->selectCursor(widget, ArrowCursor); - } ---- qt-2.3.10/src/kernel/qgfxlinuxfb_qws.cpp~64bit 2005-01-23 14:00:46.000000000 +0000 -+++ qt-2.3.10/src/kernel/qgfxlinuxfb_qws.cpp 2005-12-14 12:04:56.000000000 +0000 -@@ -42,6 +42,7 @@ - #include - #include - #include -+#include - - #include "qgfxlinuxfb_qws.h" - #include "qwindowsystem_qws.h" -@@ -164,7 +165,7 @@ - MAP_SHARED, fd, 0); - data += dataoffset; - -- if ((int)data == -1) { -+ if ((intptr_t)data == -1) { - perror("mapping /dev/fb0"); - qWarning("Error: failed to map framebuffer device to memory."); - return FALSE; -@@ -703,7 +704,7 @@ - psize += 8; // for alignment - psize &= ~0x7; // align - -- unsigned int pos=(unsigned int)data; -+ uintptr_t pos=(uintptr_t)data; - pos += psize; - entryp = ((int *)pos); - lowest = ((unsigned int *)pos)+1; ---- qt-2.3.10/src/kernel/qmemorymanager_qws.h~64bit 2005-01-23 14:00:46.000000000 +0000 -+++ qt-2.3.10/src/kernel/qmemorymanager_qws.h 2005-12-14 12:00:32.000000000 +0000 -@@ -33,6 +33,9 @@ - #ifndef QMEMORYMANAGER_H - #define QMEMORYMANAGER_H - -+/* Needed for uintptr_t to allow 64bit clean pointer handling */ -+#include -+ - #ifndef QT_H - #include - #include -@@ -126,8 +129,8 @@ - // constructs from a memory ptr to where the data after the item starts - QSMCacheItemPtr(void *data) { - char *ptr = (char*)data; -- if ( (int)ptr != (((int)ptr+3)&~3) ) -- qDebug("err, passed a non-aligned data ptr %x", (int)ptr); -+ if (intptr_t(data)&3!=0) -+ qDebug("err, passed a non-aligned data ptr %p", ptr); - d = (QSMCacheItem*)(ptr - sizeof(QSMCacheItem)); - } - // returns a pointer to the data after the item ---- qt-2.3.10/src/kernel/qwsregionmanager_qws.cpp~64bit 2005-12-14 13:25:06.000000000 +0000 -+++ qt-2.3.10/src/kernel/qwsregionmanager_qws.cpp 2005-12-14 13:25:51.000000000 +0000 -@@ -32,6 +32,7 @@ - #include "qwsdisplay_qws.h" - #include "qwsregionmanager_qws.h" - #include -+#include - - #ifndef QT_NO_QWS_MULTIPROCESS - #include -@@ -286,7 +287,7 @@ - data = (unsigned char *)shmat( shmId, 0, SHM_RDONLY ); - } - -- return ( shmId != -1 && (int)data != -1 ); -+ return ( shmId != -1 && (intptr_t)data != -1 ); - #else - int dataSize = sizeof(QWSRegionHeader) // header - + sizeof(QWSRegionIndex) * QT_MAX_REGIONS // + index ---- qt-2.3.10/src/kernel/qpixmapcache.cpp~64bit 2005-12-14 13:26:43.000000000 +0000 -+++ qt-2.3.10/src/kernel/qpixmapcache.cpp 2005-12-14 13:30:33.000000000 +0000 -@@ -38,6 +38,7 @@ - #include "qpixmapcache.h" - #include "qcache.h" - #include "qobject.h" -+#include - - - // REVISED: paul -@@ -519,7 +520,7 @@ - #endif // DEBUG_SHARED_MEMORY_CACHE - } - -- if ( shmId == -1 || (int)shm == -1 ) -+ if ( shmId == -1 || (intptr_t)shm == -1 ) - qFatal("Cannot attach to shared memory"); - - qt_sharedMemoryData = shm->data; -@@ -536,8 +537,8 @@ - shm->tail.setFree(false); - shm->tail.setNextFree(QSMemPtr()); - #ifdef THROW_AWAY_UNUSED_PAGES -- int freePageStart = PAGE_ALIGN((int)&shm->first + sizeof(QSMemNode)); -- int freePagesLength = PAGE_ALIGN((int)&shm->tail) - freePageStart; -+ intptr_t freePageStart = PAGE_ALIGN((intptr_t)&shm->first + sizeof(QSMemNode)); -+ intptr_t freePagesLength = PAGE_ALIGN((intptr_t)&shm->tail) - freePageStart; - if ( freePagesLength ) { - # ifdef DEBUG_SHARED_MEMORY_CACHE - qDebug("Initially marking free pages as not needed"); -@@ -770,8 +771,8 @@ - node = newFreeNode->next(); - - #ifdef THROW_AWAY_UNUSED_PAGES -- int freePageStart = PAGE_ALIGN((int)newFreeNode+sizeof(QSMemNode)); -- int freePagesLength = PAGE_ALIGN((int)node) - freePageStart; -+ intptr_t freePageStart = PAGE_ALIGN((intptr_t)newFreeNode+sizeof(QSMemNode)); -+ intptr_t freePagesLength = PAGE_ALIGN((intptr_t)node) - freePageStart; - if ( freePagesLength ) { - #ifdef DEBUG_SHARED_MEMORY_CACHE - qDebug("Marking pages not needed"); ---- qt-2.3.10/src/kernel/qwidget_qws.cpp~64bit 2005-12-14 12:20:46.000000000 +0000 -+++ qt-2.3.10/src/kernel/qwidget_qws.cpp 2005-12-14 12:30:35.000000000 +0000 -@@ -50,6 +50,7 @@ - #include "qwsmanager_qws.h" - #include "qwsregionmanager_qws.h" - #include "qinputcontext_p.h" -+#include - - void qt_insert_sip( QWidget*, int, int ); // defined in qapplication_x11.cpp - int qt_sip_count( QWidget* ); // --- "" --- -@@ -633,7 +634,7 @@ - qt_mouseGrb->releaseMouse(); - - qwsDisplay()->grabMouse(this,TRUE); -- qwsDisplay()->selectCursor(this, (unsigned int)cursor.handle()); -+ qwsDisplay()->selectCursor(this, (uintptr_t)cursor.handle()); - qt_mouseGrb = this; - qt_pressGrab = 0; - } -@@ -1840,11 +1841,11 @@ - void QWidget::updateCursor( const QRegion &r ) const - { - if ( qt_last_x && (!QWidget::mouseGrabber() || QWidget::mouseGrabber() == this) && -- qt_last_cursor != (WId)cursor().handle() && !qws_overrideCursor ) { -+ qt_last_cursor != (uintptr_t)cursor().handle() && !qws_overrideCursor ) { - QSize s( qt_screen->width(), qt_screen->height() ); - QPoint pos = qt_screen->mapToDevice(QPoint(*qt_last_x, *qt_last_y), s); - if ( r.contains(pos) ) -- qwsDisplay()->selectCursor((QWidget*)this, (unsigned int)cursor().handle()); -+ qwsDisplay()->selectCursor((QWidget*)this, (uintptr_t)cursor().handle()); - } - } - #endif ---- qt-2.3.10/tools/qvfb/qvfbview.cpp~64bit 2005-12-14 13:32:47.000000000 +0000 -+++ qt-2.3.10/tools/qvfb/qvfbview.cpp 2005-12-14 13:33:27.000000000 +0000 -@@ -40,6 +40,7 @@ - #include - #include - #include -+#include - - - QVFbView::QVFbView( int display_id, int _w, int _h, int d, Rotation r, QWidget *parent, -@@ -136,7 +137,7 @@ - data = (unsigned char *)shmat( shmId, 0, 0 ); - } - -- if ( (int)data == -1 ){ -+ if ( (intptr_t)data == -1 ){ - ::close(mouseFd); - ::close(keyboardFd); - qFatal( "Cannot attach to shared memory %d",shmId ); diff --git a/packages/uicmoc/uicmoc3-native-3.3.5/use_stdint_types.patch b/packages/uicmoc/uicmoc3-native-3.3.5/use_stdint_types.patch deleted file mode 100644 index 17836802a6..0000000000 --- a/packages/uicmoc/uicmoc3-native-3.3.5/use_stdint_types.patch +++ /dev/null @@ -1,147 +0,0 @@ ---- qt-embedded-free-3.3.5/src/embedded/qgfxlinuxfb_qws.cpp~64bit 2005-12-14 15:51:23.000000000 +0000 -+++ qt-embedded-free-3.3.5/src/embedded/qgfxlinuxfb_qws.cpp 2005-12-14 15:52:29.000000000 +0000 -@@ -176,7 +176,7 @@ - MAP_SHARED, fd, 0); - data += dataoffset; - -- if ((int)data == -1) { -+ if ((intptr_t)data == -1) { - perror("mapping /dev/fb0"); - qWarning("Error: failed to map framebuffer device to memory."); - return FALSE; -@@ -737,7 +737,7 @@ - psize += 8; // for alignment - psize &= ~0x7; // align - -- unsigned int pos=(unsigned int)data; -+ uintptr_t pos=(uintptr_t)data; - pos += psize; - entryp = ((int *)pos); - lowest = ((unsigned int *)pos)+1; ---- qt-embedded-free-3.3.5/src/kernel/qsharedmemory_p.cpp~64bit 2005-12-14 15:34:43.000000000 +0000 -+++ qt-embedded-free-3.3.5/src/kernel/qsharedmemory_p.cpp 2005-12-14 15:35:26.000000000 +0000 -@@ -31,6 +31,7 @@ - **********************************************************************/ - - #include "qsharedmemory_p.h" -+#include - - #if !defined(QT_QWS_NO_SHM) - -@@ -132,7 +133,7 @@ - shmId = shmget (key, shmSize, 0); - - shmBase = shmat (shmId, 0, 0); -- if ((int) shmBase == -1 || shmBase == 0) -+ if ((intptr_t) shmBase == -1 || shmBase == 0) - return FALSE; - else - return TRUE; ---- qt-embedded-free-3.3.5/src/kernel/qapplication_qws.cpp~64bit 2005-12-14 15:27:14.000000000 +0000 -+++ qt-embedded-free-3.3.5/src/kernel/qapplication_qws.cpp 2005-12-14 15:28:37.000000000 +0000 -@@ -107,6 +107,7 @@ - #include - #include - #include -+#include - - #if defined(Q_OS_QNX) - #include -@@ -1879,7 +1880,7 @@ - w = widgetAt(*qt_last_x, *qt_last_y, FALSE); - if ( !w ) - w = desktop(); -- QPaintDevice::qwsDisplay()->selectCursor(w, (int)app_cursor->handle()); -+ QPaintDevice::qwsDisplay()->selectCursor(w, (intptr_t)app_cursor->handle()); - } - - void QApplication::restoreOverrideCursor() -@@ -1898,11 +1899,11 @@ - cursorStack = 0; - qws_overrideCursor = FALSE; - if ( w->testWState(WState_OwnCursor) ) -- QPaintDevice::qwsDisplay()->selectCursor(w, (int)w->cursor().handle()); -+ QPaintDevice::qwsDisplay()->selectCursor(w, (intptr_t)w->cursor().handle()); - else - QPaintDevice::qwsDisplay()->selectCursor(w, ArrowCursor); - } else { -- QPaintDevice::qwsDisplay()->selectCursor(w, (int)app_cursor->handle()); -+ QPaintDevice::qwsDisplay()->selectCursor(w, (intptr_t)app_cursor->handle()); - } - } - #endif// QT_NO_CURSOR -@@ -2130,7 +2131,7 @@ - } - if ( !qws_overrideCursor ) { - if (curs) -- QPaintDevice::qwsDisplay()->selectCursor(widget, (int)curs->handle()); -+ QPaintDevice::qwsDisplay()->selectCursor(widget, (intptr_t)curs->handle()); - else - QPaintDevice::qwsDisplay()->selectCursor(widget, ArrowCursor); - } ---- qt-embedded-free-3.3.5/src/kernel/qfont_qws.cpp~64bit 2005-12-14 15:29:17.000000000 +0000 -+++ qt-embedded-free-3.3.5/src/kernel/qfont_qws.cpp 2005-12-14 15:29:54.000000000 +0000 -@@ -49,6 +49,7 @@ - #include "qgfx_qws.h" - #include "qtextengine_p.h" - #include "qfontengine_p.h" -+#include - - QFont::Script QFontPrivate::defaultScript = QFont::UnknownScript; - -@@ -133,7 +134,7 @@ - req.pointSize = req.pixelSize*10; - - if ( ! engineData ) { -- QFontCache::Key key( req, QFont::NoScript, (int)paintdevice ); -+ QFontCache::Key key( req, QFont::NoScript, (intptr_t)paintdevice ); - - // look for the requested font in the engine data cache - engineData = QFontCache::instance->findEngineData( key ); ---- qt-embedded-free-3.3.5/src/kernel/qwsregionmanager_qws.cpp~64bit 2005-12-14 15:32:12.000000000 +0000 -+++ qt-embedded-free-3.3.5/src/kernel/qwsregionmanager_qws.cpp 2005-12-14 15:32:52.000000000 +0000 -@@ -32,6 +32,7 @@ - #include "qwsdisplay_qws.h" - #include "qwsregionmanager_qws.h" - #include -+#include - - #ifndef QT_NO_QWS_MULTIPROCESS - #include -@@ -288,7 +289,7 @@ - data = (unsigned char *)shmat( shmId, 0, 0 ); - } - -- return ( shmId != -1 && (int)data != -1 ); -+ return ( shmId != -1 && (intptr_t)data != -1 ); - #else - int dataSize = sizeof(QWSRegionHeader) // header - + sizeof(QWSRegionIndex) * QT_MAX_REGIONS // + index ---- qt-embedded-free-3.3.5/src/kernel/qwidget_qws.cpp~64bit 2005-12-14 15:30:36.000000000 +0000 -+++ qt-embedded-free-3.3.5/src/kernel/qwidget_qws.cpp 2005-12-14 15:31:37.000000000 +0000 -@@ -53,6 +53,7 @@ - #include "qwsmanager_qws.h" - #include "qwsregionmanager_qws.h" - #include "qinputcontext_p.h" -+#include - - void qt_insert_sip( QWidget*, int, int ); // defined in qapplication_x11.cpp - int qt_sip_count( QWidget* ); // --- "" --- -@@ -631,7 +632,7 @@ - qt_mouseGrb->releaseMouse(); - - qwsDisplay()->grabMouse(this,TRUE); -- qwsDisplay()->selectCursor(this, (unsigned int)cursor.handle()); -+ qwsDisplay()->selectCursor(this, (uintptr_t)cursor.handle()); - qt_mouseGrb = this; - qt_pressGrab = 0; - } -@@ -1845,7 +1846,7 @@ - QSize s( qt_screen->width(), qt_screen->height() ); - QPoint pos = qt_screen->mapToDevice(QPoint(*qt_last_x, *qt_last_y), s); - if ( r.contains(pos) ) -- qwsDisplay()->selectCursor((QWidget*)this, (unsigned int)cursor().handle()); -+ qwsDisplay()->selectCursor((QWidget*)this, (uintptr_t)cursor().handle()); - } - } - #endif -- cgit v1.2.3 From f6f3d654a28cd012fbf275f7b74e8d6c94846c96 Mon Sep 17 00:00:00 2001 From: Matthias Hentges Date: Sun, 26 Mar 2006 21:12:29 +0000 Subject: mplayer: fix a typo in PR --- packages/mplayer/mplayer_1.0pre7.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/mplayer/mplayer_1.0pre7.bb b/packages/mplayer/mplayer_1.0pre7.bb index 5413ab214c..25194beec9 100644 --- a/packages/mplayer/mplayer_1.0pre7.bb +++ b/packages/mplayer/mplayer_1.0pre7.bb @@ -15,7 +15,7 @@ SRC_URI = "http://www1.mplayerhq.hu/MPlayer/releases/MPlayer-${PV}.tar.bz2 \ MAINTAINER="Graeme Gregory " RCONFLICTS_${PN} = "mplayer-atty" -PR = "3" +PR = "r3" PARALLEL_MAKE = "" -- cgit v1.2.3