--- conf/checksums.ini | 20 +++++ conf/distro/include/preferred-shr-versions.inc | 15 ++-- conf/distro/include/shr-autorev-unstable.inc | 3 +- conf/distro/shr.conf | 2 +- recipes/aceofpenguins/aceofpenguins_1.2.bb | 7 +-- recipes/connman/connman_git.bb | 5 +- recipes/fbreader/fbreader_0.8.2a.bb | 5 +- recipes/ipkg-utils/ipkg-utils_1.6+cvs20050404.bb | 5 +- recipes/libmikmod/libmikmod_3.2.0-beta2.bb | 6 ++ .../fix-configure-for-new-autotools.patch | 11 +++ recipes/openmoko2/libmokoui2/configure.patch | 10 +++ recipes/openmoko2/libmokoui2/makefile.am.patch | 19 +++++ recipes/openmoko2/libmokoui2_svn.bb | 15 +++- .../openmoko2/openmoko-icon-theme-standard2_svn.bb | 6 +- recipes/pingus/pingus_0.7.2.bb | 5 +- recipes/resolvconf/resolvconf_1.43.bb | 29 -------- recipes/resolvconf/resolvconf_1.45.bb | 29 ++++++++ .../tangogps/tangogps-0.9.7/maptile-zoom-fix.patch | 76 ++++++++++++++++++++ recipes/tangogps/tangogps.inc | 2 +- recipes/tangogps/tangogps_0.9.7.bb | 4 + recipes/xorg-lib/libxfont-native_1.4.0.bb | 2 + 21 files changed, 221 insertions(+), 55 deletions(-) create mode 100644 recipes/openmoko-projects/openmoko-agpsui/fix-configure-for-new-autotools.patch create mode 100644 recipes/openmoko2/libmokoui2/configure.patch create mode 100644 recipes/openmoko2/libmokoui2/makefile.am.patch delete mode 100644 recipes/resolvconf/resolvconf_1.43.bb create mode 100644 recipes/resolvconf/resolvconf_1.45.bb create mode 100644 recipes/tangogps/tangogps-0.9.7/maptile-zoom-fix.patch create mode 100644 recipes/tangogps/tangogps_0.9.7.bb
diff --git a/conf/checksums.ini b/conf/checksums.ini index 73d75d6..1621200 100644 --- a/conf/checksums.ini +++ b/conf/checksums.ini @@ -3366,6 +3366,10 @@ sha256=5ab58cf5738c144f4d85a4a442c2f33be2c4c502dca6e29e0c570c2a51ae6ae9 md5=41d6a2dfe88693b5ec999d9ae4e97aac sha256=e3ff9a7f6dead90d55f1a4a2b1277e3bf5f0ec44ccb6ba8f375acbbedb1263c1 +[http://handheldshell.com/software/fso/btgps.tgz] +md5=6e0443d09448a5cfdb1d560cfd699a6b +sha256=ca567348c1f8d904f50fe06de83959dcc5b840e12e336251ab216ca5304e3bf0 + [http://www.pentest.co.uk/src/btscanner-1.0.tar.gz] md5=6bfaaad5a3730f10d07500fb3ec8c797 sha256=ca7349c3621c929f9fda0345991b35f8a0d38d4a88b6c89b7ca50a7dbcc08832 @@ -4858,6 +4862,10 @@ sha256=8016540602189e1dca6aca6b7c0735706387e4f85ced75217c6a874980fd0e86 md5=2c267ccd45d0b18db8c9edacad63ec98 sha256=f58c66e5117f0c66fbc51f99dd994c5e603baa5df2e3d7250a9d880f2b4e1a54 +[http://dbus.freedesktop.org/releases/dbus/dbus-1.2.16.tar.gz] +md5=c7a47b851ebe02f6726b65b78d1b730b +sha256=968a31c16a6c4bbbdb603cbaa3d60d6d19bc8ae30c0ed55d7f8c2e254413e4c8 + [http://dbus.freedesktop.org/releases/dbus/dbus-1.3.0.tar.gz] md5=b3298d5ce0e4ad4731b1e4e1787d56bb sha256=fe32b49667894cf91b0a97503163be5c4814ecf67259e8feb26d1ba57cb03dae @@ -21926,6 +21934,10 @@ sha256=703b204bd1d57b1bfc0ba95246d229a599259b782ee18072d6041656d412073b md5=499cfc69b3cacbdf70a32f253b4a0eb1 sha256=cb5a5855c68743622b1902c7c106b30316c623c265906f2acb2fa2c9d97b3f37 +[http://handheldshell.com/software/pyring_1.1.10.tgz] +md5=d6d2a16ccd1562b2ae63314f30a4ebf9 +sha256=45b73399b8affd1a81ecd370d37e066c046c49e1777b43d0affe6b520082a604 + [http://handheldshell.com/software/pyring_1.1.8.tgz] md5=77359741229bf18af9476d5c41355fe0 sha256=4db4c58ec9b4cf7ebaae4e5f09ac6c90364805affd1ba7e852a12f8931ae7fd3 @@ -22454,6 +22466,10 @@ sha256=73fd760d3b5cbf06417576591dc37d67380d189392db9000c21b7cbebee49ffc md5=72811b7d7fecfbdca45d5a74394daa4f sha256=c3b9bffd3e27090d4c0623ef61f48257343d0f6ea1cf573f5296250ab7551e5d +[http://download.savannah.nongnu.org/releases/qwo/qwo-0.5.tar.gz] +md5=9e1f7394be0a2eb2891e915f594d5f95 +sha256=fbb416acee1f8fe56394f37074154138f3cf324f48ce611cc2df40eb73b5c9ff + [http://downloads.sourceforge.net/qwt/qwt-4.2.0rc1.tgz] md5=142b10ab27e837c3c4603cf9a7e9343b sha256=3b6db68d53441119dced27e5bad26ec087294cb9d878d37bcea61e1f1e4849a1 @@ -22706,6 +22722,10 @@ sha256=17e1105cddd928adf7d47e050f9bb49557850687f800b3e24cbbf22933ff31ae md5=15faef2aba7b99782f3b0b8b5d30f80a sha256=17e1105cddd928adf7d47e050f9bb49557850687f800b3e24cbbf22933ff31ae +[ftp://ftp.debian.org/debian/pool/main/r/resolvconf/resolvconf_1.45.tar.gz] +md5=1f0b0bccb4dc0a762dacf6aca716e71d +sha256=096a0696f925334f4f9fcc87df3305999f4b9f9d630fe6f2fa0179f3d56467f3 + [http://xlibs.freedesktop.org/release/resourceext-1.0.tar.bz2] md5=007713326ca5f1adfd39f3cb587c3b9b sha256=78e0a532bb84d6d85e90244bf3bb0ee9a5246545ebc9b677173e37e231d30cdc diff --git a/conf/distro/include/preferred-shr-versions.inc b/conf/distro/include/preferred-shr-versions.inc index 83270d4..8aa6f6e 100644 --- a/conf/distro/include/preferred-shr-versions.inc +++ b/conf/distro/include/preferred-shr-versions.inc @@ -65,7 +65,7 @@ PREFERRED_VERSION_avetanabt ?= "20060413" PREFERRED_VERSION_bacula-client ?= "1.38.11" PREFERRED_VERSION_balsa ?= "2.0.17" PREFERRED_VERSION_base-files ?= "3.0.14" -PREFERRED_VERSION_base-passwd ?= "3.5.9" +PREFERRED_VERSION_base-passwd ?= "3.5.20" PREFERRED_VERSION_bash ?= "3.2" PREFERRED_VERSION_bash-completion ?= "20040711" PREFERRED_VERSION_bazaar ?= "1.2" @@ -104,9 +104,9 @@ PREFERRED_VERSION_bmon ?= "2.1.0" PREFERRED_VERSION_boa ?= "0.94.13" PREFERRED_VERSION_bochs ?= "2.1" PREFERRED_VERSION_bogofilter ?= "0.96.0" -PREFERRED_VERSION_boost ?= "1.33.1" +PREFERRED_VERSION_boost ?= "1.36.0" PREFERRED_VERSION_boost-asio ?= "0.3.7" -PREFERRED_VERSION_boost-jam-native ?= "3.1.11" +PREFERRED_VERSION_boost-jam-native ?= "3.1.16" PREFERRED_VERSION_bootchart ?= "0.9" PREFERRED_VERSION_bootmenu ?= "0.7" PREFERRED_VERSION_bootsplash ?= "3.0.7" @@ -177,7 +177,6 @@ PREFERRED_VERSION_comprec ?= "0.02" PREFERRED_VERSION_confuse ?= "2.5" PREFERRED_VERSION_confuse-native ?= "2.5" PREFERRED_VERSION_connect ?= "0.1" -PREFERRED_VERSION_connman ?= "0.22" PREFERRED_VERSION_conserver ?= "8.1.14" PREFERRED_VERSION_console-tools ?= "0.3.2" PREFERRED_VERSION_contacts ?= "0.7" @@ -509,7 +508,7 @@ PREFERRED_VERSION_gnumeric ?= "1.6.3" PREFERRED_VERSION_gnupg ?= "1.4.2.2" PREFERRED_VERSION_gnuplot ?= "4.2.2" PREFERRED_VERSION_gnuradio ?= "3.0.4" -PREFERRED_VERSION_gnutls ?= "1.6.3" +PREFERRED_VERSION_gnutls ?= "2.4.2" PREFERRED_VERSION_gob2 ?= "2.0.14" PREFERRED_VERSION_gobby ?= "0.4.1" PREFERRED_VERSION_goffice ?= "0.2.1" @@ -1020,7 +1019,7 @@ PREFERRED_VERSION_libsm ?= "1.0.3" PREFERRED_VERSION_libsndfile1 ?= "1.0.17" PREFERRED_VERSION_libsoundgen ?= "0.6" PREFERRED_VERSION_libsoup ?= "2.2.100" -PREFERRED_VERSION_libsoup-2.4 ?= "2.26.2" +PREFERRED_VERSION_libsoup-2.4 ?= "2.27.91" PREFERRED_VERSION_libspf2 ?= "1.0.4" PREFERRED_VERSION_libspiff ?= "0.8.2" PREFERRED_VERSION_libssh ?= "0.11" @@ -1660,7 +1659,7 @@ PREFERRED_VERSION_reiser4progs ?= "1.0.4" PREFERRED_VERSION_reiserfsprogs ?= "3.6.19" PREFERRED_VERSION_renderproto ?= "0.9.3" PREFERRED_VERSION_resistorui ?= "0.9" -PREFERRED_VERSION_resolvconf ?= "1.41" +PREFERRED_VERSION_resolvconf ?= "1.45" PREFERRED_VERSION_resourceext ?= "1.0" PREFERRED_VERSION_resourceproto ?= "1.0.2" PREFERRED_VERSION_rfakeap ?= "0.2" @@ -1962,7 +1961,7 @@ PREFERRED_VERSION_void11 ?= "0.2.0" PREFERRED_VERSION_vorbis-tools ?= "1.0.1" PREFERRED_VERSION_vpnc ?= "0.3.3" PREFERRED_VERSION_vsftpd ?= "2.0.5" -PREFERRED_VERSION_vte ?= "0.16.13" +PREFERRED_VERSION_vte ?= "0.20.0" PREFERRED_VERSION_vtun ?= "2.6" PREFERRED_VERSION_w3cam ?= "0.7.2" PREFERRED_VERSION_wakelan ?= "1.1" diff --git a/conf/distro/include/shr-autorev-unstable.inc b/conf/distro/include/shr-autorev-unstable.inc index 5fcd51e..27c70f7 100644 --- a/conf/distro/include/shr-autorev-unstable.inc +++ b/conf/distro/include/shr-autorev-unstable.inc @@ -136,7 +136,8 @@ SRCREV_pn-openmoocow = "${AUTOREV}" SRCREV_pn-libmokoui2 = "4695" SRCREV_pn-intone = "${AUTOREV}" SRCREV_pn-intone-video = "${AUTOREV}" -SRCREV_pn-connman = "aac35324deb8c0b57f881338d87cb36b0979e7df" +#SRCREV_pn-connman = "aac35324deb8c0b57f881338d87cb36b0979e7df" +SRCREV_pn-connman = "039571c9db317fa8f63c4d1cc6210506c0d9deb5" SRCREV_pn-msn-pecan = "${AUTOREV}" SRCREV_pn-omgps = "${AUTOREV}" SRCREV_pn-shr-today = "${AUTOREV}" diff --git a/conf/distro/shr.conf b/conf/distro/shr.conf index ab0a69f..5e02612 100644 --- a/conf/distro/shr.conf +++ b/conf/distro/shr.conf @@ -77,7 +77,7 @@ PREFERRED_PROVIDER_bluez-utils-dbus = "bluez4" PREFERRED_PROVIDER_virtual/libusb0 = "libusb" PREFERRED_PROVIDER_libfribidi = "libfribidi" - +PREFERRED_PROVIDER_util-linux = "util-linux-ng" # for jalimo PREFERRED_PROVIDER_virtual/javac-native = "ecj-bootstrap-native" PREFERRED_PROVIDER_classpath = "classpath" diff --git a/recipes/aceofpenguins/aceofpenguins_1.2.bb b/recipes/aceofpenguins/aceofpenguins_1.2.bb index 758aeae..9410eb9 100644 --- a/recipes/aceofpenguins/aceofpenguins_1.2.bb +++ b/recipes/aceofpenguins/aceofpenguins_1.2.bb @@ -14,8 +14,5 @@ S = "${WORKDIR}/ace-${PV}" inherit autotools - -do_configure_prepend() { - # Workaround QA issue - export CC="${CC} ${LDFLAGS}" -} \ No newline at end of file +# Workaround QA issue +TARGET_CC_ARCH += "${LDFLAGS}" \ No newline at end of file diff --git a/recipes/connman/connman_git.bb b/recipes/connman/connman_git.bb index 523d39b..4cb48b5 100644 --- a/recipes/connman/connman_git.bb +++ b/recipes/connman/connman_git.bb @@ -20,16 +20,19 @@ EXTRA_OECONF = " \ --enable-fake \ " +EXTRA_OECONF_append_shr += "--disable-tools" + require connman.inc SRCREV = "1a94db417ecaba20a609ff4b4431a3f67c5dcbc6" PV = "0.42+git" -PR = "r0" +PR = "r1" PR_append = ".gitr${SRCREV}" DEFAULT_PREFERENCE = "-1" DEFAULT_PREFERENCE_angstrom = "1" +DEFAULT_PREFERENCE_shr = "1" SRC_URI = "\ git://git.kernel.org/pub/scm/network/connman/connman.git;protocol=git \ diff --git a/recipes/fbreader/fbreader_0.8.2a.bb b/recipes/fbreader/fbreader_0.8.2a.bb index 7d6a2b0..490d8b5 100644 --- a/recipes/fbreader/fbreader_0.8.2a.bb +++ b/recipes/fbreader/fbreader_0.8.2a.bb @@ -4,7 +4,7 @@ SECTION = "x11/utils" PRIORITY = "optional" LICENSE = "GPLv2" DEPENDS = "gtk+ enca expat bzip2 libgpewidget virtual/libiconv" -PR = "r5" +PR = "r6" # The RESOLUTION is defined at compile time which makes # this package MACHINE specific. @@ -23,6 +23,9 @@ SRC_URI_append_akita = "\ SRC_URI_append_htcuniversal = "\ file://zaurus-VGA.patch;patch=1" +# Workaround QA issue +TARGET_CC_ARCH += "${LDFLAGS}" + # Set the defaults READER_RESOLUTION = "240x320" READER_ARCH = "openzaurus" diff --git a/recipes/ipkg-utils/ipkg-utils_1.6+cvs20050404.bb b/recipes/ipkg-utils/ipkg-utils_1.6+cvs20050404.bb index 8baffd2..d746177 100644 --- a/recipes/ipkg-utils/ipkg-utils_1.6+cvs20050404.bb +++ b/recipes/ipkg-utils/ipkg-utils_1.6+cvs20050404.bb @@ -5,7 +5,7 @@ LICENSE = "GPL" CONFLICTS = "ipkg-link" RDEPENDS = "python" SRCDATE = "20050404" -PR = "r23" +PR = "r24" SRC_URI = "${HANDHELDS_CVS};module=ipkg-utils \ file://ipkg-utils-fix.patch;patch=1 \ @@ -19,6 +19,9 @@ SRC_URI = "${HANDHELDS_CVS};module=ipkg-utils \ S = "${WORKDIR}/ipkg-utils" +# Workaround QA issue +TARGET_CC_ARCH += "${LDFLAGS}" + INSTALL = "ipkg-build ipkg-deb-unbuild ipkg-unbuild ipkg-compare-versions ipkg-upload ipkg-make-index ipkg-link ipkg.py ipkg-list-fields" do_compile() { diff --git a/recipes/libmikmod/libmikmod_3.2.0-beta2.bb b/recipes/libmikmod/libmikmod_3.2.0-beta2.bb index 07e3af9..4124d58 100644 --- a/recipes/libmikmod/libmikmod_3.2.0-beta2.bb +++ b/recipes/libmikmod/libmikmod_3.2.0-beta2.bb @@ -3,6 +3,8 @@ SECTION = "libs" PRIORITY = "optional" LICENSE = "LGPL" +PR = "r1" + DEFAULT_PREFERENCE = "-1" SRC_URI = "\ @@ -24,6 +26,10 @@ EXTRA_OECONF = "\ --enable-threads \ " +# Workaround QA issue +TARGET_CC_ARCH += "${LDFLAGS}" + + do_stage() { oe_libinstall -a -so -C libmikmod libmikmod ${STAGING_LIBDIR} install -m 0644 ${S}/include/mikmod.h ${STAGING_INCDIR}/ diff --git a/recipes/openmoko-projects/openmoko-agpsui/fix-configure-for-new-autotools.patch b/recipes/openmoko-projects/openmoko-agpsui/fix-configure-for-new-autotools.patch new file mode 100644 index 0000000..b190cf6 --- /dev/null +++ b/recipes/openmoko-projects/openmoko-agpsui/fix-configure-for-new-autotools.patch @@ -0,0 +1,11 @@ +diff -uri openmoko-agpsui/trunk/configure.ac openmoko-agpsui-fixed/trunk/configure.ac +--- openmoko-agpsui/trunk/configure.ac 2009-05-30 12:24:11.000000000 +0200 ++++ openmoko-agpsui-fixed/trunk/configure.ac 2009-05-30 12:26:32.000000000 +0200 +@@ -7,6 +7,7 @@ + + AC_ISC_POSIX + AC_PROG_CC ++AC_PROG_CXX + AC_STDC_HEADERS + AC_PROG_LIBTOOL + diff --git a/recipes/openmoko2/libmokoui2/configure.patch b/recipes/openmoko2/libmokoui2/configure.patch new file mode 100644 index 0000000..174c598 --- /dev/null +++ b/recipes/openmoko2/libmokoui2/configure.patch @@ -0,0 +1,10 @@ +--- libmokoui.old/configure.ac 2009-06-10 12:42:32.000000000 +0200 ++++ libmokoui2/configure.ac 2009-06-10 12:42:43.000000000 +0200 +@@ -28,7 +28,6 @@ + + if test $enable_python != no ; then + AM_PATH_PYTHON(2.3.5) +- PKG_CHECK_MODULES(GNOME_PYTHON, gnome-python-2.0 >= 2.10.00) + AC_SUBST(PYGDK_CFLAGS) + AC_SUBST(PYGDK_LIBS) + diff --git a/recipes/openmoko2/libmokoui2/makefile.am.patch b/recipes/openmoko2/libmokoui2/makefile.am.patch new file mode 100644 index 0000000..79f0a48 --- /dev/null +++ b/recipes/openmoko2/libmokoui2/makefile.am.patch @@ -0,0 +1,19 @@ +--- libmokoui.old/bindings/python/Makefile.am 2009-06-10 12:42:32.000000000 +0200 ++++ libmokoui2/bindings/python/Makefile.am 2009-06-10 12:51:45.000000000 +0200 +@@ -1,13 +1,12 @@ +- +-PY_DEFS=`pkg-config --variable=defsdir pygtk-2.0` +-PYTHON_INCLUDES=-I/usr/include/python${PYTHON_VERSION} ++PY_DEFS=${PKG_CONFIG_SYSROOT_DIR}`pkg-config --variable=defsdir pygtk-2.0` ++PYTHON_INCLUDES=-I${PKG_CONFIG_SYSROOT_DIR}/usr/include/python${PYTHON_VERSION} + + CLEANFILES = \ + mokoui.defs \ + mokoui.c + + mokoui.defs: ../../libmokoui/moko-finger-scroll.h +- python /usr/share/pygtk/2.0/codegen/h2def.py ../../libmokoui/moko-finger-scroll.h > mokoui.defs ++ python ${PKG_CONFIG_SYSROOT_DIR}`pkg-config --variable=codegendir pygtk-2.0`/h2def.py ../../libmokoui/moko-finger-scroll.h > mokoui.defs + + mokoui.c: mokoui.defs mokoui.override + pygtk-codegen-2.0 --prefix mokoui \ diff --git a/recipes/openmoko2/libmokoui2_svn.bb b/recipes/openmoko2/libmokoui2_svn.bb index d52b247..e51aa1a 100644 --- a/recipes/openmoko2/libmokoui2_svn.bb +++ b/recipes/openmoko2/libmokoui2_svn.bb @@ -1,12 +1,19 @@ SECTION = "openmoko/libs" -DEPENDS = "gtk+" +DEPENDS = "gtk+ python-pygtk" + PV = "0.1.0+svnr${SRCREV}" -PR = "r2" +PR = "r5" inherit openmoko2 +SRC_URI += "\ + file://configure.patch;patch=1 \ + file://makefile.am.patch;patch=1 \ + " LICENSE = "LGPL" +EXTRA_OECONF += " --enable-python" + do_configure_prepend() { touch gtk-doc.make } @@ -14,4 +21,6 @@ do_configure_prepend() { do_stage() { autotools_stage_all } - +FILES_${PN} += "${libdir}/python2.6/site-packages/mokoui.*" +FILES_${PN}-dbg += "${libdir}/python2.6/site-packages/.debug/" +FILES_${PN}-dev += "/usr/share/vala/vapi/" \ No newline at end of file diff --git a/recipes/openmoko2/openmoko-icon-theme-standard2_svn.bb b/recipes/openmoko2/openmoko-icon-theme-standard2_svn.bb index e145fb2..79b2d93 100644 --- a/recipes/openmoko2/openmoko-icon-theme-standard2_svn.bb +++ b/recipes/openmoko2/openmoko-icon-theme-standard2_svn.bb @@ -9,9 +9,9 @@ SRC_URI = "svn://svn.openmoko.org/trunk/src/target/OM-2007.2/artwork/;module=ico S = "${WORKDIR}/icons" pkg_postinst_${PN} () { - if [ "x$D" != "x" ]; then - exit 1 - fi +# if [ "x$D" != "x" ]; then +# exit 1 +# fi gtk-update-icon-cache -q /usr/share/icons/openmoko-standard } diff --git a/recipes/pingus/pingus_0.7.2.bb b/recipes/pingus/pingus_0.7.2.bb index a10131f..ce73ca9 100644 --- a/recipes/pingus/pingus_0.7.2.bb +++ b/recipes/pingus/pingus_0.7.2.bb @@ -3,10 +3,13 @@ DEPENDS = "virtual/libsdl libsdl-image libsdl-mixer boost libpng" LICENSE = "GPL" HOMEPAGE = "http://pingus.seul.org/"; SECTION = "x11/games" -PR = "r1" +PR = "r2" ARM_INSTRUCTION_SET = "arm" +# Workaround QA issue +TARGET_CC_ARCH += "${LDFLAGS}" + inherit scons SRC_URI = "\ diff --git a/recipes/resolvconf/resolvconf_1.43.bb b/recipes/resolvconf/resolvconf_1.43.bb deleted file mode 100644 index 2c210ef..0000000 --- a/recipes/resolvconf/resolvconf_1.43.bb +++ /dev/null @@ -1,29 +0,0 @@ -DESCRIPTION = "Resolvconf is a framework for keeping track of the system's \ -information about currently available nameservers. It sets \ -itself up as the intermediary between programs that supply \ -nameserver information and programs that need nameserver \ -information." -SECTION = "console/network" -LICENSE = "GPL" -AUTHOR = "Thomas Hood" -HOMEPAGE = "http://packages.debian.org/resolvconf"; -DEPENDS = "bash" -RDEPENDS = "bash" - -SRC_URI = "${DEBIAN_MIRROR}/main/r/resolvconf/resolvconf_${PV}.tar.gz" - -do_compile () { - : -} - -do_install () { - install -d ${D}${sysconfdir} ${D}${sbindir} ${D}${base_sbindir} ${D}${localstatedir}/run/resolvconf/interface - install -d ${D}${mandir}/man8 ${D}${docdir}/${P} - cp -pPR etc/* ${D}${sysconfdir}/ - install -m 0755 bin/resolvconf ${D}${base_sbindir}/ - install -m 0644 README ${D}${docdir}/${P}/ - install -m 0644 man/resolvconf.8 ${D}${mandir}/man8/ -} - -PACKAGE_ARCH = "all" - diff --git a/recipes/resolvconf/resolvconf_1.45.bb b/recipes/resolvconf/resolvconf_1.45.bb new file mode 100644 index 0000000..2c210ef --- /dev/null +++ b/recipes/resolvconf/resolvconf_1.45.bb @@ -0,0 +1,29 @@ +DESCRIPTION = "Resolvconf is a framework for keeping track of the system's \ +information about currently available nameservers. It sets \ +itself up as the intermediary between programs that supply \ +nameserver information and programs that need nameserver \ +information." +SECTION = "console/network" +LICENSE = "GPL" +AUTHOR = "Thomas Hood" +HOMEPAGE = "http://packages.debian.org/resolvconf"; +DEPENDS = "bash" +RDEPENDS = "bash" + +SRC_URI = "${DEBIAN_MIRROR}/main/r/resolvconf/resolvconf_${PV}.tar.gz" + +do_compile () { + : +} + +do_install () { + install -d ${D}${sysconfdir} ${D}${sbindir} ${D}${base_sbindir} ${D}${localstatedir}/run/resolvconf/interface + install -d ${D}${mandir}/man8 ${D}${docdir}/${P} + cp -pPR etc/* ${D}${sysconfdir}/ + install -m 0755 bin/resolvconf ${D}${base_sbindir}/ + install -m 0644 README ${D}${docdir}/${P}/ + install -m 0644 man/resolvconf.8 ${D}${mandir}/man8/ +} + +PACKAGE_ARCH = "all" + diff --git a/recipes/tangogps/tangogps-0.9.7/maptile-zoom-fix.patch b/recipes/tangogps/tangogps-0.9.7/maptile-zoom-fix.patch new file mode 100644 index 0000000..ae249bb --- /dev/null +++ b/recipes/tangogps/tangogps-0.9.7/maptile-zoom-fix.patch @@ -0,0 +1,76 @@ +=== modified file 'src/map_management.c' +--- src/map_management.c 2009-09-26 02:35:15 +0000 ++++ src/map_management.c 2009-10-02 02:40:39 +0000 +@@ -19,8 +19,6 @@ + #include "wp.h" + + +-static GdkPixbuf *pixbuf = NULL; +-static GdkPixbuf *pixbuf_scaled = NULL; + static GError *error = NULL; + static GdkGC *gc_map = NULL; + +@@ -42,6 +40,8 @@ load_tile( gchar *dir, + gboolean tile_found = FALSE; + repo_t *repo; + static gchar filename[256]; ++ ++ GdkPixbuf *pixbuf = NULL; + + + printf("* load tile()\n"); +@@ -55,15 +55,6 @@ load_tile( gchar *dir, + } + else printf("no drawable -> NULL\n"); + +- +- +- if (pixbuf) +- g_object_unref (pixbuf); +- +- if (pixbuf_scaled) +- g_object_unref (pixbuf_scaled); +- +- + + for(overzoom=0; overzoom<=3; overzoom++) + { +@@ -83,6 +74,8 @@ load_tile( gchar *dir, + + if(pixbuf && overzoom) + { ++ GdkPixbuf *pixbuf_scaled = NULL; ++ + + pixbuf_scaled = gdk_pixbuf_new(GDK_COLORSPACE_RGB, TRUE, 8, 256, 256); + +@@ -92,6 +85,13 @@ load_tile( gchar *dir, + -TILESIZE*(x%upscale), -TILESIZE*(y%upscale), + upscale, upscale, + GDK_INTERP_BILINEAR ); ++ ++ if (pixbuf) ++ { ++ g_object_unref (pixbuf); ++ } ++ ++ pixbuf = pixbuf_scaled; + } + + if(!tile_found) +@@ -129,12 +129,13 @@ load_tile( gchar *dir, + gdk_draw_pixbuf ( + pixmap, + gc_map, +- (overzoom ? pixbuf_scaled : pixbuf), ++ pixbuf, + 0,0, + offset_x,offset_y, + TILESIZE,TILESIZE, + GDK_RGB_DITHER_NONE, 0, 0); + ++ g_object_unref (pixbuf); + } + + + diff --git a/recipes/tangogps/tangogps.inc b/recipes/tangogps/tangogps.inc index 677000f..9897461 100644 --- a/recipes/tangogps/tangogps.inc +++ b/recipes/tangogps/tangogps.inc @@ -12,4 +12,4 @@ S = "${WORKDIR}/tangogps-${PV}" inherit autotools pkgconfig RRECOMMENDS = "gpsd" - +RRECOMMENDS_shr = "fso-gpsd" diff --git a/recipes/tangogps/tangogps_0.9.7.bb b/recipes/tangogps/tangogps_0.9.7.bb new file mode 100644 index 0000000..4ed7d24 --- /dev/null +++ b/recipes/tangogps/tangogps_0.9.7.bb @@ -0,0 +1,4 @@ +require tangogps.inc +PR = "r2" + +SRC_URI_append = " file://maptile-zoom-fix.patch;patch=1;pnum=0" diff --git a/recipes/xorg-lib/libxfont-native_1.4.0.bb b/recipes/xorg-lib/libxfont-native_1.4.0.bb index efd1e07..4ebb493 100644 --- a/recipes/xorg-lib/libxfont-native_1.4.0.bb +++ b/recipes/xorg-lib/libxfont-native_1.4.0.bb @@ -8,3 +8,5 @@ PE = "1" SRC_URI = "${XORG_MIRROR}/individual/lib/${XORG_PN}-${PV}.tar.bz2" inherit native + +PROVIDES = "xfont-native" \ No newline at end of file -- 1.6.4.3 _______________________________________________ Shr-devel mailing list [email protected] http://lists.shr-project.org/mailman/listinfo/shr-devel
