pimlico: Clean up libowl handling to be consistent
This commit is contained in:
parent
e584e7c246
commit
3ab04a953d
|
@ -115,7 +115,7 @@ SRCREV_pn-networkmanager ?= "2984"
|
|||
SRCREV_pn-table ?= "4b267533ce16656cba4104fc39dc12709c1bdddf"
|
||||
SRCREV_pn-ubootchart ?= "10"
|
||||
|
||||
SRCREV_pn-dates ?= "966969063535da0786b7483c1bcd427df8a0d87d"
|
||||
SRCREV_pn-dates ?= "8a79a9fc52c73bf256decfedd0fe7d399553e7aa"
|
||||
SRCREV_pn-tasks ?= "ea52d46d691c5fce4473ea4e24a35411381f3a65"
|
||||
SRCREV_pn-contacts ?= "c8e6b16222d5bc9d8f60ae6594af4933613a4e25"
|
||||
SRCREV_pn-dfu-util-native ?= "3139"
|
||||
|
|
|
@ -1,12 +1,16 @@
|
|||
DESCRIPTION = "Address-book application."
|
||||
LICENSE = "LGPL"
|
||||
SECTION = "x11"
|
||||
DEPENDS = "glib-2.0 gtk+ eds-dbus libowl"
|
||||
DEPENDS = "glib-2.0 gtk+ eds-dbus"
|
||||
DEPENDS_append_poky = " libowl"
|
||||
RDEPENDS = "libedata-book"
|
||||
|
||||
inherit autotools_stage pkgconfig
|
||||
|
||||
EXTRA_OECONF += "--disable-gnome-vfs"
|
||||
OWL = "--disable-owl"
|
||||
OWL_poky = "--enable-owl"
|
||||
|
||||
EXTRA_OECONF += "--disable-gnome-vfs ${OWL}"
|
||||
EXTRA_OEMAKE += "GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1"
|
||||
|
||||
do_install_append () {
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
require contacts.inc
|
||||
|
||||
PR="r1"
|
||||
PR = "r2"
|
||||
|
||||
SRC_URI =+ "http://pimlico-project.org/sources/${PN}/${PN}-${PV}.tar.gz"
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
require contacts.inc
|
||||
|
||||
PV = "0.9+git${SRCPV}"
|
||||
|
||||
PR = "r1"
|
||||
|
||||
SRC_URI =+ "git://git.gnome.org/${PN};protocol=git"
|
||||
|
||||
|
|
|
@ -1,12 +1,16 @@
|
|||
DESCRIPTION = "Dates is a calendar application."
|
||||
LICENSE = "LGPL"
|
||||
SECTION = "x11"
|
||||
DEPENDS = "glib-2.0 gtk+ libglade eds-dbus libowl"
|
||||
DEPENDS = "glib-2.0 gtk+ libglade eds-dbus"
|
||||
RDEPENDS = "libedata-cal"
|
||||
|
||||
inherit autotools_stage pkgconfig gtk-icon-cache
|
||||
|
||||
# Poky/Sato specific enhancements
|
||||
EXTRA_OECONF_append_poky = " --enable-owl=true --disable-dnd"
|
||||
OWL = "--disable-owl"
|
||||
OWL_poky = "--enable-owl --disable-dnd"
|
||||
|
||||
EXTRA_OECONF += "${OWL}"
|
||||
DEPENDS_append_poky = " libowl"
|
||||
SRC_URI_append_poky = " file://dates-owl-window-menu.patch;patch=1 "
|
||||
|
||||
|
|
|
@ -1,23 +1,9 @@
|
|||
---
|
||||
src/Makefile.am | 2 +-
|
||||
src/dates_gtk.c | 5 -----
|
||||
src/dates_main.c | 5 +++++
|
||||
src/dates_platform.h | 2 +-
|
||||
4 files changed, 7 insertions(+), 7 deletions(-)
|
||||
3 files changed, 7 insertions(+), 7 deletions(-)
|
||||
|
||||
Index: git/src/Makefile.am
|
||||
===================================================================
|
||||
--- git.orig/src/Makefile.am 2009-08-18 12:44:56.000000000 +0100
|
||||
+++ git/src/Makefile.am 2009-09-03 22:28:50.000000000 +0100
|
||||
@@ -35,7 +35,7 @@
|
||||
gconf-bridge.h \
|
||||
gconf-bridge.c
|
||||
|
||||
-dates_LDADD = $(DATES_LIBS) libgtkdatesview.la
|
||||
+dates_LDADD = $(DATES_LIBS) libgtkdatesview.la -lowl
|
||||
|
||||
if USE_OWL
|
||||
dates_LDADD += $(top_builddir)/libowl/libowl.la
|
||||
Index: git/src/dates_gtk.c
|
||||
===================================================================
|
||||
--- git.orig/src/dates_gtk.c 2009-08-18 12:44:56.000000000 +0100
|
||||
|
|
|
@ -1,7 +1,5 @@
|
|||
require dates.inc
|
||||
|
||||
PR = "r1"
|
||||
PR = "r3"
|
||||
|
||||
SRC_URI = "http://pimlico-project.org/sources/dates/dates-${PV}.tar.gz \
|
||||
file://dates-owl-window-menu.patch;patch=1 \
|
||||
"
|
||||
SRC_URI = "http://pimlico-project.org/sources/dates/dates-${PV}.tar.gz"
|
||||
|
|
|
@ -1,6 +1,8 @@
|
|||
require dates.inc
|
||||
|
||||
PV = "0.4.9+git${SRCPV}"
|
||||
PR = "r2"
|
||||
|
||||
S = "${WORKDIR}/git"
|
||||
|
||||
SRC_URI = "git://git.gnome.org/${PN};protocol=git"
|
||||
|
|
|
@ -1,7 +1,12 @@
|
|||
DESCRIPTION = "Task list application"
|
||||
LICENSE = "GPL"
|
||||
SECTION = "x11"
|
||||
DEPENDS = "glib-2.0 gtk+ eds-dbus libowl"
|
||||
DEPENDS = "glib-2.0 gtk+ eds-dbus"
|
||||
DEPENDS_append_poky = " libowl"
|
||||
|
||||
inherit autotools_stage pkgconfig gtk-icon-cache
|
||||
|
||||
OWL = "--disable-owl"
|
||||
OWL_poky = "--enable-owl"
|
||||
|
||||
EXTRA_OECONF += "${OWL}
|
||||
|
|
|
@ -5,4 +5,4 @@ SRC_URI = "http://pimlico-project.org/sources/${PN}/${PN}-${PV}.tar.gz \
|
|||
|
||||
SRC_URI_append_poky = " file://tasks-owl.diff;patch=1 "
|
||||
|
||||
PR = "r2"
|
||||
PR = "r3"
|
||||
|
|
|
@ -3,4 +3,6 @@ require tasks.inc
|
|||
SRC_URI = "git://git.gnome.org/${PN};protocol=git"
|
||||
|
||||
PV = "0.13+git${SRCPV}"
|
||||
PR = "r1"
|
||||
|
||||
S = "${WORKDIR}/git"
|
||||
|
|
Loading…
Reference in New Issue