[oe-commits] org.oe.dev merge of '1387039c3c15738450afefa2fce201e47d65b903'
justinp commit
openembedded-commits at lists.openembedded.org
Sun Jul 15 18:17:12 UTC 2007
merge of '1387039c3c15738450afefa2fce201e47d65b903'
and '452f86f495845b7b3291db690dea35910db6e714'
Author: justinp at openembedded.org
Branch: org.openembedded.dev
Revision: cea63599c6976631be6796d7e5bce389c5656d7a
ViewMTN: http://monotone.openembedded.org/revision.psp?id=cea63599c6976631be6796d7e5bce389c5656d7a
Files:
1
packages/qte/qte-2.3.10/kernel-keymap-tosa.patch
packages/qte/qte-2.3.12/kernel-keymap-tosa.patch
packages/efl1/ecore.inc
packages/efl1/ecore_0.9.9.038.bb
packages/gettext/gettext_0.14.1.bb
packages/opie-eye/opie-eye.inc
packages/opie-eye/opie-eye_cvs.bb
packages/qte/qte-common_2.3.10.inc
packages/qte/qte-common_2.3.12.inc
packages/qte/qte-mt_2.3.10.bb
packages/uicmoc/uicmoc-native-2.3.10/kernel-asm-page.patch
packages/uicmoc/uicmoc-native_2.3.10.bb
packages/xqt2/xqt2_20060509.bb
packages/cups/cups_1.2.10.bb
Diffs:
#
# mt diff -r1387039c3c15738450afefa2fce201e47d65b903 -rcea63599c6976631be6796d7e5bce389c5656d7a
#
#
#
# delete "packages/qte/qte-2.3.10/kernel-keymap-tosa.patch"
#
# delete "packages/qte/qte-2.3.12/kernel-keymap-tosa.patch"
#
# patch "packages/efl1/ecore.inc"
# from [7442e1e7c41e107a54a20b3aa6f342a6576b7c82]
# to [8bf0449e6585d11368ae42e9f7202d62e3cfbd68]
#
# patch "packages/efl1/ecore_0.9.9.038.bb"
# from [5ec84c54a07f1dbee07b88b733bf261c33ece218]
# to [0afdc56ffc7928972b6e2d526cec184ec5e4b55c]
#
# patch "packages/gettext/gettext_0.14.1.bb"
# from [9ecf01387ee1e01907691353d51b4df632016841]
# to [e36d89752702208db243d7f58d7848a83bad0563]
#
# patch "packages/opie-eye/opie-eye.inc"
# from [5674381010bd353d1e82972d2fcc8324a76b3af7]
# to [f711c2a63c4f4a76a1b041b875f912e32c7b8179]
#
# patch "packages/opie-eye/opie-eye_cvs.bb"
# from [017464348c276e066180e327d33b24804719a9a3]
# to [eb96503094d447b1c01a7c344499f0b16d872262]
#
# patch "packages/qte/qte-common_2.3.10.inc"
# from [58250b89691c1d93785c622140a3d2ac4811e575]
# to [bde46cd3d1b884e666a8b3bdefa49535f7ca8e24]
#
# patch "packages/qte/qte-common_2.3.12.inc"
# from [d14749cf53a308b080c951db99e9e2f3b5d47aaa]
# to [f862afcb658da887be9b9154438f93d16c6999b9]
#
# patch "packages/qte/qte-mt_2.3.10.bb"
# from [a3ba8bd85a149c38fea9a0deedd00ff8e8208cec]
# to [bae988477366a1761d0c9dfebc4675baa6e415ec]
#
# patch "packages/uicmoc/uicmoc-native-2.3.10/kernel-asm-page.patch"
# from [80a6d114216133cf5b84be77d9090ced7721b591]
# to [a39f97d0da5e0a3b4566cbcd06c6c4c9ee184c6f]
#
# patch "packages/uicmoc/uicmoc-native_2.3.10.bb"
# from [5f5ef578c72a6f1a4350fd30b2b73d049ce313c6]
# to [aef21967161c38e506e0763c794755313d83cad0]
#
# patch "packages/xqt2/xqt2_20060509.bb"
# from [a2dff87ee91d27df1459b0fc14a4859df06a6b6a]
# to [2499ff8ee6fb929e9922ee2b49b7a79b3d965698]
#
============================================================
--- packages/efl1/ecore.inc 7442e1e7c41e107a54a20b3aa6f342a6576b7c82
+++ packages/efl1/ecore.inc 8bf0449e6585d11368ae42e9f7202d62e3cfbd68
@@ -1,10 +1,10 @@ DEPENDS = "curl dbus directfb eet evas t
DESCRIPTION = "Ecore is the core event abstraction layer for the enlightenment \
foundation libraries. It makes makes doing selections, drag and drop, event loops, \
timeouts and idle handlers fast, optimized, and convenient."
LICENSE = "MIT"
DEPENDS = "curl dbus directfb eet evas tslib"
# optional
-# DEPENDS += "openssl iconv"
+# DEPENDS += "openssl virtual/libiconv"
inherit efl1
@@ -16,7 +16,6 @@ FILESDIR = "${@os.path.dirname(bb.data.g
S = "${WORKDIR}/ecore-${PV}"
FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/ecore"
-EXTRA_OECONF = "<override me>"
do_stage() {
autotools_stage_all
@@ -36,17 +35,17 @@ PACKAGES += "\
${PN}-txt \
${PN}-x \
"
-FILES_${PN} = "${libdir}/libecore.so*"
-FILES_${PN}-con = "${libdir}/libecore_con.so*"
-FILES_${PN}-config = "${libdir}/libecore_config.so*"
-FILES_${PN}-dbus = "${libdir}/libecore_dbus.so*"
-FILES_${PN}-desktop = "${libdir}/libecore_desktop.so*"
-FILES_${PN}-directfb = "${libdir}/libecore_directfb.so*"
-FILES_${PN}-evas = "${libdir}/libecore_evas.so*"
-FILES_${PN}-fb = "${libdir}/libecore_fb.so*"
-FILES_${PN}-file = "${libdir}/libecore_file.so*"
-FILES_${PN}-ipc = "${libdir}/libecore_ipc.so*"
-FILES_${PN}-job = "${libdir}/libecore_job.so*"
-FILES_${PN}-txt = "${libdir}/libecore_txt.so*"
-FILES_${PN}-x = "${libdir}/libecore_x.so*"
+FILES_${PN} = "${libdir}/libecore.so.*"
+FILES_${PN}-con = "${libdir}/libecore_con.so.*"
+FILES_${PN}-config = "${libdir}/libecore_config.so.*"
+FILES_${PN}-dbus = "${libdir}/libecore_dbus.so.*"
+FILES_${PN}-desktop = "${libdir}/libecore_desktop.so.*"
+FILES_${PN}-directfb = "${libdir}/libecore_directfb.so.*"
+FILES_${PN}-evas = "${libdir}/libecore_evas.so.*"
+FILES_${PN}-fb = "${libdir}/libecore_fb.so.*"
+FILES_${PN}-file = "${libdir}/libecore_file.so.*"
+FILES_${PN}-ipc = "${libdir}/libecore_ipc.so.*"
+FILES_${PN}-job = "${libdir}/libecore_job.so.*"
+FILES_${PN}-txt = "${libdir}/libecore_txt.so.*"
+FILES_${PN}-x = "${libdir}/libecore_x.so.*"
============================================================
--- packages/efl1/ecore_0.9.9.038.bb 5ec84c54a07f1dbee07b88b733bf261c33ece218
+++ packages/efl1/ecore_0.9.9.038.bb 0afdc56ffc7928972b6e2d526cec184ec5e4b55c
@@ -1,5 +1,5 @@ require ecore.inc
require ecore.inc
-PR = "r1"
+PR = "r4"
EXTRA_OECONF = "\
--enable-ecore-txt \
============================================================
--- packages/gettext/gettext_0.14.1.bb 9ecf01387ee1e01907691353d51b4df632016841
+++ packages/gettext/gettext_0.14.1.bb e36d89752702208db243d7f58d7848a83bad0563
@@ -17,7 +17,7 @@ inherit autotools
inherit autotools
-EXTRA_OECONF += "--without-lisp"
+EXTRA_OECONF += "--without-lisp --disable-csharp"
acpaths = '-I ${S}/autoconf-lib-link/m4/ \
-I ${S}/gettext-runtime/m4 \
-I ${S}/gettext-tools/m4'
============================================================
--- packages/opie-eye/opie-eye.inc 5674381010bd353d1e82972d2fcc8324a76b3af7
+++ packages/opie-eye/opie-eye.inc f711c2a63c4f4a76a1b041b875f912e32c7b8179
@@ -19,8 +19,8 @@ do_install() {
}
do_install() {
- install -d ${D}${palmtopdir}/bin
- install -m 0755 opie-eye_slave ${D}${palmtopdir}/bin/
+ install -d ${D}${bindir}
+ install -m 0755 opie-eye_slave ${D}${bindir}
install -d ${D}${palmtopdir}/pics/${APPNAME}/
install -m 0644 ${WORKDIR}/pics/${APPNAME}/*.png ${D}${palmtopdir}/pics/${APPNAME}/
}
============================================================
--- packages/opie-eye/opie-eye_cvs.bb 017464348c276e066180e327d33b24804719a9a3
+++ packages/opie-eye/opie-eye_cvs.bb eb96503094d447b1c01a7c344499f0b16d872262
@@ -1,6 +1,7 @@ PV = "${OPIE_CVS_PV}"
require ${PN}.inc
PV = "${OPIE_CVS_PV}"
+PR = "r1"
SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/graphics/opie-eye \
${HANDHELDS_CVS};module=opie/pics \
============================================================
--- packages/qte/qte-common_2.3.10.inc 58250b89691c1d93785c622140a3d2ac4811e575
+++ packages/qte/qte-common_2.3.10.inc bde46cd3d1b884e666a8b3bdefa49535f7ca8e24
@@ -63,7 +63,6 @@ SRC_URI_append_akita = "file://ke
SRC_URI_append_c7x0 = "${W100_ACCEL_PATCHES} "
SRC_URI_append_spitz = "file://kernel-keymap-CXK.patch;patch=1 "
SRC_URI_append_akita = "file://kernel-keymap-CXK.patch;patch=1 "
-SRC_URI_append_tosa = "file://kernel-keymap-tosa.patch;patch=1 "
# "ipaqs" used to have this, but later were proven to at least work
# without it. Review again and see if has interesting bits to be applied
@@ -115,6 +114,7 @@ EXTRA_DEFINES_palmld = "-DQT_QWS_TSLIB
EXTRA_DEFINES_jornada6xx = "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_IPAQ"
EXTRA_DEFINES_jornada7xx = "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_IPAQ"
EXTRA_DEFINES_palmld = "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_IPAQ"
+EXTRA_DEFINES_palmt650 = "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_IPAQ"
EXTRA_DEFINES_palmtx = "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_IPAQ"
EXTRA_DEFINES_simpad = "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_IPAQ -DQT_QWS_SIMPAD -DQT_QWS_DEVFS"
EXTRA_DEFINES_c7x0 = "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_SL5XXX -DQT_QWS_SLC700"
============================================================
--- packages/qte/qte-common_2.3.12.inc d14749cf53a308b080c951db99e9e2f3b5d47aaa
+++ packages/qte/qte-common_2.3.12.inc f862afcb658da887be9b9154438f93d16c6999b9
@@ -38,7 +38,7 @@ SRC_URI_append_e680 = "file://ke
SRC_URI_append_poodle = "file://kernel-keymap.patch;patch=1;pnum=0 "
SRC_URI_append_a780 = "file://kernel-keymap.patch;patch=1;pnum=0 "
SRC_URI_append_e680 = "file://kernel-keymap.patch;patch=1;pnum=0 "
-SRC_URI_append_tosa = "file://kernel-keymap.patch;patch=1;pnum=0 file://kernel-keymap-tosa.patch;patch=1 "
+SRC_URI_append_tosa = "file://kernel-keymap.patch;patch=1;pnum=0 "
SRC_URI_append_jornada7xx = "file://kernel-keymap.patch;patch=1;pnum=0 file://ipaq_sound_fix.patch;patch=1 "
SRC_URI_append_jornada56x = "file://kernel-keymap.patch;patch=1;pnum=0 file://ipaq_sound_fix.patch;patch=1 "
SRC_URI_append_h3600 = "file://ipaq-keyboard.patch;patch=1 file://ipaq_sound_fix.patch;patch=1 "
============================================================
--- packages/qte/qte-mt_2.3.10.bb a3ba8bd85a149c38fea9a0deedd00ff8e8208cec
+++ packages/qte/qte-mt_2.3.10.bb bae988477366a1761d0c9dfebc4675baa6e415ec
@@ -1,5 +1,5 @@ require qte-common_${PV}.inc
require qte-common_${PV}.inc
-PR = "r17"
+PR = "r18"
EXTRA_OECONF += "-thread"
============================================================
--- packages/uicmoc/uicmoc-native-2.3.10/kernel-asm-page.patch 80a6d114216133cf5b84be77d9090ced7721b591
+++ packages/uicmoc/uicmoc-native-2.3.10/kernel-asm-page.patch a39f97d0da5e0a3b4566cbcd06c6c4c9ee184c6f
@@ -1,11 +1,11 @@ index c2e7d9b..8d39585 100644
diff --git a/src/kernel/qpixmapcache.cpp b/src/kernel/qpixmapcache.cpp
index c2e7d9b..8d39585 100644
--- a/src/kernel/qpixmapcache.cpp
+++ b/src/kernel/qpixmapcache.cpp
-@@ -123,9 +123,13 @@ void cleanup_pixmap_cache();
+@@ -123,9 +123,12 @@ void cleanup_pixmap_cache();
#ifdef THROW_AWAY_UNUSED_PAGES
# include <sys/mman.h> // madvise
- # include <asm/page.h> // PAGE_SIZE,PAGE_MASK,PAGE_ALIGN
+-# include <asm/page.h> // PAGE_SIZE,PAGE_MASK,PAGE_ALIGN
+# include <unistd.h> // getpagesize()
+# if (!defined(PAGE_ALIGN)) && defined(PAGE_SIZE) && defined(PAGE_MASK)
+# define PAGE_ALIGN(addr) (((addr)+PAGE_SIZE-1)&PAGE_MASK)
============================================================
--- packages/uicmoc/uicmoc-native_2.3.10.bb 5f5ef578c72a6f1a4350fd30b2b73d049ce313c6
+++ packages/uicmoc/uicmoc-native_2.3.10.bb aef21967161c38e506e0763c794755313d83cad0
@@ -1,9 +1,9 @@ LICENSE = "GPL QPL"
DESCRIPTION = "User Interface Generator and Meta Object Compiler (moc) for Qt(E) 2.x"
HOMEPAGE = "http://www.trolltech.com"
SECTION = "devel"
PRIORITY = "optional"
LICENSE = "GPL QPL"
-PR = "r3"
+PR = "r4"
SRC_URI = "ftp://ftp.trolltech.com/pub/qt/source/qt-embedded-${PV}-free.tar.gz \
file://fix-makefile.patch;patch=1 \
============================================================
--- packages/xqt2/xqt2_20060509.bb a2dff87ee91d27df1459b0fc14a4859df06a6b6a
+++ packages/xqt2/xqt2_20060509.bb 2499ff8ee6fb929e9922ee2b49b7a79b3d965698
@@ -5,7 +5,7 @@ APPNAME = "Xqt"
SECTION = "opie/applications"
APPTYPE = "binary"
APPNAME = "Xqt"
-PR = "r1"
+PR = "r2"
inherit palmtop
@@ -102,8 +102,6 @@ do_install() {
install -d ${D}${palmtopdir}/apps/Applications/
install -m 0644 ${WORKDIR}/xqt2/xfree86/files/Xqt.desktop ${D}${palmtopdir}/apps/Applications
- install -d ${D}${palmtopdir}/bin/
- install -m 0755 ${D}${bindir}/Xqt ${D}${palmtopdir}/bin/Xqt
install -d ${D}${palmtopdir}/pics
install -m 0644 programs/Xserver/hw/xqt/Xqt.png ${D}${palmtopdir}/pics
}
#
# mt diff -r452f86f495845b7b3291db690dea35910db6e714 -rcea63599c6976631be6796d7e5bce389c5656d7a
#
#
#
# patch "packages/cups/cups_1.2.10.bb"
# from [f35e4bd25f49222a16880ac6e7b5e18ab4b4f41a]
# to [01555f20ac2e318e45a508b2d1f6672b3a9e1f74]
#
============================================================
--- packages/cups/cups_1.2.10.bb f35e4bd25f49222a16880ac6e7b5e18ab4b4f41a
+++ packages/cups/cups_1.2.10.bb 01555f20ac2e318e45a508b2d1f6672b3a9e1f74
@@ -1,8 +1,8 @@ DEPENDS = "gnutls jpeg dbus dbus-glib li
DESCRIPTION = "An Internet printing system for Unix."
SECTION = "console/utils"
LICENSE = "GPL LGPL"
DEPENDS = "gnutls jpeg dbus dbus-glib libpng zlib install-native fakeroot-native"
-PR = "r0"
+PR = "r1"
SRC_URI = "ftp://ftp3.easysw.com/pub/cups/${PV}/cups-${PV}-source.tar.bz2 \
"
@@ -46,6 +46,9 @@ fakeroot do_install () {
fakeroot do_install () {
oe_runmake "DSTROOT=${D}" install
+
+ # This directory gets installed with perms 511, which makes packaging fail
+ chmod 0711 "${D}/${localstatedir}/run/cups/certs"
}
do_stage () {
@@ -56,6 +59,12 @@ do_stage () {
oe_libinstall -C filter -so libcupsimage ${STAGING_LIBDIR}
}
+python do_package_append() {
+ # Change permissions back the way they were, they probably had a reason...
+ workdir = bb.data.getVar('WORKDIR', d, 1)
+ os.system('chmod 0511 %s/install/cups/var/run/cups/certs' % workdir)
+}
+
FILES_${PN}-dbg += "${libdir}/cups/backend/.debug \
${libdir}/cups/cgi-bin/.debug \
${libdir}/cups/filter/.debug \
@@ -71,6 +80,4 @@ FILES_${PN} += "${datadir}/doc/cups/imag
${datadir}/icons/ \
"
+LEAD_SONAME = "libcups.so.*"
-
-
-
More information about the Openembedded-commits
mailing list