diff options
| -rw-r--r-- | conf/checksums.ini | 4 | ||||
| -rw-r--r-- | recipes/gnome/gnome-bluetooth_git.bb | 7 | ||||
| -rw-r--r-- | recipes/gnome/gnote_0.5.0.bb | 8 | ||||
| -rw-r--r-- | recipes/libpcre/libpcre_7.6.bb | 21 |
4 files changed, 29 insertions, 11 deletions
diff --git a/conf/checksums.ini b/conf/checksums.ini index 2f9c8289ab..0d23596456 100644 --- a/conf/checksums.ini +++ b/conf/checksums.ini @@ -8466,6 +8466,10 @@ sha256=77cb4bd39a4cec2aa3d61b0519134f9e4a65613960b3b3ee34dd2452d5e12ba7 md5=905a8df3513a519096bcf7d8efc35118 sha256=f08d0f214db875eac602bec37b20042f0ee4f14427f9559477a040ef39003538 +[http://ftp.gnome.org/pub/GNOME/sources/gnote/0.5/gnote-0.5.0.tar.bz2] +md5=ca9e67a92945af7230eae72b2e8430ec +sha256=19a1f79c42b37ee3c90ba6298442b52438f1c67d311ebd33db72210cee2d99d2 + [ftp://ftp.gnu.org/gnu/ghostscript/gnu-ghostscript-8.16.tar.gz] md5=c42dfaebc37fe81eab0b5676b124ab63 sha256=417922d35e66ee90cf93cf3e93fdf281ec6b92de4f7436c9c1a97c0cc35b94a8 diff --git a/recipes/gnome/gnome-bluetooth_git.bb b/recipes/gnome/gnome-bluetooth_git.bb index de11874fab..23c4ca92ac 100644 --- a/recipes/gnome/gnome-bluetooth_git.bb +++ b/recipes/gnome/gnome-bluetooth_git.bb @@ -11,12 +11,13 @@ SRC_URI = "git://git.gnome.org/gnome-bluetooth;protocol=git \ S = "${WORKDIR}/git" -SRCREV = "097aef044ced5937dd7e288bfee58b6138939117" +SRCREV = "93fd8de2cc717b96ad719ab2fb5ed38b8a0fc707" PV = "2.27.5" +PR = "r2" PR_append = "+gitr${SRCREV}" -DEPENDS = "obexd obex-data-server gconf-dbus gtk+ dbus-glib libunique libnotify hal bluez4 gnome-keyring" -RRECOMMENDS_${PN} += "obexd obex-data-server" +DEPENDS = "obexd gconf-dbus gtk+ dbus-glib libunique libnotify hal bluez4 gnome-keyring" +RRECOMMENDS_${PN} += "obexd" RCONFLICTS_${PN} = "bluez-gnome" do_configure_prepend() { diff --git a/recipes/gnome/gnote_0.5.0.bb b/recipes/gnome/gnote_0.5.0.bb new file mode 100644 index 0000000000..cc11022b7c --- /dev/null +++ b/recipes/gnome/gnote_0.5.0.bb @@ -0,0 +1,8 @@ +DESCRIPTION = "Note taking application" +LICENSE = "GPL" + +DEPENDS = "libpcre libgnomeui gconf-dbus gtkmm boost" + +inherit gnome + +FILES_${PN}-dbg += "${libdir}/gnote/*/*/.debug" diff --git a/recipes/libpcre/libpcre_7.6.bb b/recipes/libpcre/libpcre_7.6.bb index eb5af03db0..aa038c6e95 100644 --- a/recipes/libpcre/libpcre_7.6.bb +++ b/recipes/libpcre/libpcre_7.6.bb @@ -5,7 +5,7 @@ provides a POSIX calling interface to PCRE; the regular expressions \ themselves still follow Perl syntax and semantics. The header file for \ the POSIX-style functions is called pcreposix.h." SECTION = "devel" -PR = "r3" +PR = "r4" LICENSE = "BSD" SRC_URI = "${SOURCEFORGE_MIRROR}/pcre/pcre-${PV}.tar.bz2 \ file://pcre-cross.patch;patch=1" @@ -17,7 +17,6 @@ inherit autotools binconfig PARALLEL_MAKE = "" -LEAD_SONAME = "libpcre.so" CFLAGS_append = " -D_REENTRANT" CXXFLAGS_powerpc += "-lstdc++" EXTRA_OECONF = " --with-link-size=2 --enable-newline-is-lf --with-match-limit=10000000 --enable-rebuild-chartables --enable-utf8" @@ -40,13 +39,19 @@ do_compile () { } do_stage () { - oe_libinstall -a -so libpcre ${STAGING_LIBDIR} - oe_libinstall -a -so libpcreposix ${STAGING_LIBDIR} - install -m 0644 pcre.h ${STAGING_INCDIR}/ - install -m 0644 pcreposix.h ${STAGING_INCDIR}/ - install -d ${STAGING_BINDIR_NATIVE} + autotools_stage_all + install -d ${STAGING_BINDIR_NATIVE} install -m 0755 ${S}/dftables ${STAGING_BINDIR_NATIVE}/ } -FILES_${PN} = "${libdir}/lib*.so.*" +python populate_packages_prepend () { + pcre_libdir = bb.data.expand('${libdir}', d) + pcre_libdir_dbg = bb.data.expand('${libdir}/.debug', d) + do_split_packages(d, pcre_libdir, '^lib(.*)\.so$', 'lib%s-dev', 'libpcre %s development package', extra_depends='${PN}-dev', allow_links=True) + do_split_packages(d, pcre_libdir, '^lib(.*)\.la$', 'lib%s-dev', 'libpcre %s development package', extra_depends='${PN}-dev') + do_split_packages(d, pcre_libdir, '^lib(.*)\.a$', 'lib%s-dev', 'libpcre %s development package', extra_depends='${PN}-dev') + do_split_packages(d, pcre_libdir, '^lib(.*)\.so\.*', 'lib%s', 'libpcre %s library', extra_depends='', allow_links=True) +} + +FILES_${PN} = "${libdir}/libpcre.so.*" FILES_${PN}-dev += "${bindir}/*" |