From 2d6d93f92a3f6f2aae2a88fc81659e37ea2768e7 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Sun, 28 Aug 2005 14:01:21 +0000 Subject: preferred-versions-gpe-2.7.inc: xst 0.14 -> 0.15 --- conf/distro/preferred-gpe-versions-2.7.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/distro/preferred-gpe-versions-2.7.inc b/conf/distro/preferred-gpe-versions-2.7.inc index 2d64cf2b8b..fb29c28b7e 100644 --- a/conf/distro/preferred-gpe-versions-2.7.inc +++ b/conf/distro/preferred-gpe-versions-2.7.inc @@ -33,7 +33,7 @@ PREFERRED_VERSION_xproto ?= "6.6.2" PREFERRED_VERSION_xcursor-transparent-theme ?= "0.1.1" PREFERRED_VERSION_rxvt-unicode ?= "5.3" PREFERRED_VERSION_gtk2-theme-angelistic ?= "0.3" -PREFERRED_VERSION_xst ?= "0.14" +PREFERRED_VERSION_xst ?= "0.15" #PREFERRED_VERSION_xextensions ?= "0.0cvs${CVSDATE}" PREFERRED_VERSION_xprop ?= "0.0cvs${CVSDATE}" PREFERRED_VERSION_xhost ?= "0.0cvs20040413" -- cgit v1.2.3 From 16c391e5fb0d4636a13dcc3df5c61409afbf4816 Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Sun, 28 Aug 2005 14:09:12 +0000 Subject: efl: add feature-reduced set of esmart that builds without X and split esmart into -fb and -x11 variants --- packages/efl/esmart-fb_0.9.0.004.bb | 18 ++++++++++ packages/efl/esmart-x11_0.9.0.004.bb | 18 ++++++++++ packages/efl/esmart.inc | 43 +++++++++++++++++++++++ packages/efl/esmart/disable-x-only-features.patch | 24 +++++++++++++ packages/efl/esmart_0.9.0.004.bb | 38 -------------------- 5 files changed, 103 insertions(+), 38 deletions(-) create mode 100644 packages/efl/esmart-fb_0.9.0.004.bb create mode 100644 packages/efl/esmart-x11_0.9.0.004.bb create mode 100644 packages/efl/esmart.inc create mode 100644 packages/efl/esmart/disable-x-only-features.patch delete mode 100644 packages/efl/esmart_0.9.0.004.bb diff --git a/packages/efl/esmart-fb_0.9.0.004.bb b/packages/efl/esmart-fb_0.9.0.004.bb new file mode 100644 index 0000000000..35bef239ee --- /dev/null +++ b/packages/efl/esmart-fb_0.9.0.004.bb @@ -0,0 +1,18 @@ +include esmart.inc +PR = "r0" + +SRC_URI += "file://disable-x-only-features.patch;patch=1" + +myheaders = "esmart_container/Esmart_Container.h \ + esmart_draggies/Esmart_Draggies.h \ + esmart_file_dialog/Esmart_File_Dialog.h \ + esmart_text_entry/Esmart_Text_Entry.h \ + esmart_textarea/Esmart_Textarea.h \ + esmart_thumb/Esmart_Thumb.h" + +mylibraries = "esmart_container \ + esmart_draggies \ + esmart_file_dialog \ + esmart_text_entry \ + esmart_textarea \ + esmart_thumb" diff --git a/packages/efl/esmart-x11_0.9.0.004.bb b/packages/efl/esmart-x11_0.9.0.004.bb new file mode 100644 index 0000000000..a7c9f97584 --- /dev/null +++ b/packages/efl/esmart-x11_0.9.0.004.bb @@ -0,0 +1,18 @@ +include esmart.inc +PR = "r2" + +myheaders = "esmart_container/Esmart_Container.h \ + esmart_draggies/Esmart_Draggies.h \ + esmart_file_dialog/Esmart_File_Dialog.h \ + esmart_text_entry/Esmart_Text_Entry.h \ + esmart_textarea/Esmart_Textarea.h \ + esmart_thumb/Esmart_Thumb.h \ + esmart_trans_x11/Esmart_Trans_X11.h" + +mylibraries = "esmart_container \ + esmart_draggies \ + esmart_file_dialog \ + esmart_text_entry \ + esmart_textarea \ + esmart_thumb \ + esmart_trans_x11" diff --git a/packages/efl/esmart.inc b/packages/efl/esmart.inc new file mode 100644 index 0000000000..452222e93b --- /dev/null +++ b/packages/efl/esmart.inc @@ -0,0 +1,43 @@ +DESCRIPTION = "ESmart is a collection of smart Evas objects" +LICENSE = "MIT" +DEPENDS = "virtual/evas virtual/ecore virtual/imlib2 epsilon edje libtool" + +inherit efl + +SRC_URI = "http://enlightenment.freedesktop.org/files/esmart-${PV}.tar.gz \ + file://compile-fix.patch;patch=1" +S = "${WORKDIR}/esmart-${PV}" +FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/esmart" + +headers = "" +libraries = "" + +myheaders = "" +mylibraries = "" + +do_stage_append() { + install -d ${STAGING_INCDIR}/Esmart/ + for i in ${myheaders}; do + install -m 0644 ${S}/src/lib/$i ${STAGING_INCDIR}/Esmart/ + done + oe_libinstall -C src/lib libsmart ${STAGING_LIBDIR}/ + for i in ${mylibraries}; do + oe_libinstall -C src/lib/$i lib$i ${STAGING_LIBDIR}/ + done +} + +PACKAGES =+ "libesmart-textentry \ + libesmart-thumb \ + libesmart-container \ + libesmart-container-plugins \ + libesmart-file-dialog \ + libesmart-draggies \ + libesmart-trans-x11" +FILES_libesmart-textentry = "${libdir}/libesmart_text_entry*.so*" +FILES_libesmart-thumb = "${libdir}/libesmart_thumb*.so*" +FILES_libesmart-container = "${libdir}/libesmart_container*" +DEPENDS_libesmart-container += "libesmart-container-plugins" +FILES_libesmart-container-plugins = "${libdir}/esmart/layout/*.so" +FILES_libesmart-file-dialog = "${libdir}/libesmart_file_dialog*.so*" +FILES_libesmart-draggies = "${libdir}/libesmart_draggies*.so*" +FILES_libesarmt-trans-x11 = "${libdir}/libesmart_trans_x11*.so*" diff --git a/packages/efl/esmart/disable-x-only-features.patch b/packages/efl/esmart/disable-x-only-features.patch new file mode 100644 index 0000000000..54638841ee --- /dev/null +++ b/packages/efl/esmart/disable-x-only-features.patch @@ -0,0 +1,24 @@ + +# +# Patch managed by http://www.holgerschurig.de/patcher.html +# + +--- esmart-0.9.0.004/src/lib/Makefile.am~disable-x-only-features.patch ++++ esmart-0.9.0.004/src/lib/Makefile.am +@@ -1,8 +1,5 @@ + SUBDIRS = \ + esmart_container \ +- esmart_draggies \ + esmart_text_entry \ + esmart_file_dialog \ +- esmart_thumb \ +- esmart_trans_x11 \ +- esmart_textarea ++ esmart_thumb +--- esmart-0.9.0.004/src/Makefile.am~disable-x-only-features.patch ++++ esmart-0.9.0.004/src/Makefile.am +@@ -1,3 +1,3 @@ + MAINTAINERCLEANFILES = Makefile.in + +-SUBDIRS = lib bin ++SUBDIRS = lib diff --git a/packages/efl/esmart_0.9.0.004.bb b/packages/efl/esmart_0.9.0.004.bb deleted file mode 100644 index c68b78aeb9..0000000000 --- a/packages/efl/esmart_0.9.0.004.bb +++ /dev/null @@ -1,38 +0,0 @@ -DESCRIPTION = "ESmart is a collection of smart Evas objects" -LICENSE = "MIT" -DEPENDS = "evas-x11 ecore-x11 virtual/imlib2 epsilon edje libtool" -PR = "r2" - -inherit efl - -SRC_URI += "file://compile-fix.patch;patch=1" - -headers = "" -libraries = "" - -myheaders = "esmart_container/Esmart_Container.h \ - esmart_draggies/Esmart_Draggies.h \ - esmart_file_dialog/Esmart_File_Dialog.h \ - esmart_text_entry/Esmart_Text_Entry.h \ - esmart_textarea/Esmart_Textarea.h \ - esmart_thumb/Esmart_Thumb.h \ - esmart_trans_x11/Esmart_Trans_X11.h" - -mylibraries = "esmart_container \ - esmart_draggies \ - esmart_file_dialog \ - esmart_text_entry \ - esmart_textarea \ - esmart_thumb \ - esmart_trans_x11" - -do_stage_append() { - install -d ${STAGING_INCDIR}/Esmart/ - for i in ${myheaders}; do - install -m 0644 ${S}/src/lib/$i ${STAGING_INCDIR}/Esmart/ - done - oe_libinstall -C src/lib libsmart ${STAGING_LIBDIR}/ - for i in ${mylibraries}; do - oe_libinstall -C src/lib/$i lib$i ${STAGING_LIBDIR}/ - done -} -- cgit v1.2.3 From 9082a53cfe8a33e2ae9419b5afd27aa93702e8ed Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Sun, 28 Aug 2005 14:09:38 +0000 Subject: e17: catch up with esmart changes --- packages/e17/e-iconbar_20050810.bb | 4 ++-- packages/e17/e-modules_20050810.bb | 4 ++-- packages/e17/e-utils_20050810.bb | 4 ++-- packages/e17/eclair_20050810.bb | 4 ++-- packages/e17/engage_20050810.bb | 4 ++-- packages/e17/entrance_20050810.bb | 4 ++-- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/packages/e17/e-iconbar_20050810.bb b/packages/e17/e-iconbar_20050810.bb index 9eae8a37b2..f0ca322f96 100644 --- a/packages/e17/e-iconbar_20050810.bb +++ b/packages/e17/e-iconbar_20050810.bb @@ -1,10 +1,10 @@ DESCRIPTION = "An Iconbar for the Enlightenment Window Manager" -DEPENDS = "edb eet evas-x11 ecore-x11 edje esmart imlib2-x11" +DEPENDS = "edb eet evas-x11 ecore-x11 edje esmart-x11 imlib2-x11" LICENSE = "MIT" SECTION = "e/apps" MAINTAINER = "Justin Patrin " CVSDATE = "${PV}" -PR = "r0" +PR = "r1" SRC_URI = "cvs://anonymous@cvs.sourceforge.net/cvsroot/enlightenment;module=e17/apps/iconbar" S = "${WORKDIR}/iconbar" diff --git a/packages/e17/e-modules_20050810.bb b/packages/e17/e-modules_20050810.bb index 1764c21450..c019c441e1 100644 --- a/packages/e17/e-modules_20050810.bb +++ b/packages/e17/e-modules_20050810.bb @@ -1,10 +1,10 @@ DESCRIPTION = "Enlightenment Window Manager Extra Modules" -DEPENDS = "virtual/ecore virtual/evas esmart edje eet e" +DEPENDS = "virtual/ecore virtual/evas virtual/esmart edje eet e" LICENSE = "MIT" SECTION = "e/apps" MAINTAINER = "Justin Patrin " CVSDATE = "${PV}" -PR = "r0" +PR = "r1" inherit autotools diff --git a/packages/e17/e-utils_20050810.bb b/packages/e17/e-utils_20050810.bb index 00fa240264..4d0ba6fa73 100644 --- a/packages/e17/e-utils_20050810.bb +++ b/packages/e17/e-utils_20050810.bb @@ -1,10 +1,10 @@ DESCRIPTION = "Enlightenment Window Manager Utilities" -DEPENDS = "virtual/ecore virtual/evas esmart edje eet ewl engrave virtual/imlib2 e epsilon" +DEPENDS = "virtual/ecore virtual/evas virtual/esmart edje eet ewl engrave virtual/imlib2 e epsilon" LICENSE = "MIT" SECTION = "e/apps" MAINTAINER = "Justin Patrin " CVSDATE = "${PV}" -PR = "r0" +PR = "r1" inherit autotools diff --git a/packages/e17/eclair_20050810.bb b/packages/e17/eclair_20050810.bb index 62385e141c..7138f06f88 100644 --- a/packages/e17/eclair_20050810.bb +++ b/packages/e17/eclair_20050810.bb @@ -1,11 +1,11 @@ DESCRIPTION = "Eclair is the E17 multi media player" SECTION = "e/apps" -DEPENDS = "evas-x11 ecore-x11 embryo imlib2-x11 edje-native edje libxine-x11 emotion esmart libxml2 sqlite3 taglibc" +DEPENDS = "evas-x11 ecore-x11 embryo imlib2-x11 edje-native edje libxine-x11 emotion esmart-x11 libxml2 sqlite3 taglibc" LICENSE = "MIT" HOMEPAGE = "http://www.enlightenment.org" MAINTAINER = "Justin Patrin " CVSDATE = "${PV}" -PR = "r0" +PR = "r1" SRC_URI = "cvs://anonymous@cvs.sourceforge.net/cvsroot/enlightenment;module=e17/apps/eclair" S = "${WORKDIR}/eclair" diff --git a/packages/e17/engage_20050810.bb b/packages/e17/engage_20050810.bb index f12d7d2605..077858d8eb 100644 --- a/packages/e17/engage_20050810.bb +++ b/packages/e17/engage_20050810.bb @@ -1,9 +1,9 @@ DESCRIPTION = "Engage is the E17 icon dock" -DEPENDS = "evas-x11 ecore-x11 esmart imlib2-x11 edje ewl e" +DEPENDS = "evas-x11 ecore-x11 esmart-x11 imlib2-x11 edje ewl e" LICENSE = "MIT" SECTION = "e/apps" MAINTAINER = "Justin Patrin " -PR = "r1" +PR = "r2" SRC_URI = "cvs://anonymous@cvs.sourceforge.net/cvsroot/enlightenment;module=misc/engage \ file://no-local-includes.patch;patch=1" diff --git a/packages/e17/entrance_20050810.bb b/packages/e17/entrance_20050810.bb index e43fe9aff8..672f05594b 100644 --- a/packages/e17/entrance_20050810.bb +++ b/packages/e17/entrance_20050810.bb @@ -2,12 +2,12 @@ DESCRIPTION = "Entrace is the Enlightenment login manager" SECTION = "e/apps" LICENSE = "MIT" # can also use pam and crypt -DEPENDS = "edb evas-x11 ecore-x11 edje esmart bash keylaunch detect-stylus x11-common" +DEPENDS = "edb evas-x11 ecore-x11 edje esmart-x11 bash keylaunch detect-stylus x11-common" RDEPENDS += "bash keylaunch detect-stylus x11-common" HOMEPAGE = "http://www.enlightenment.org" MAINTAINER = "Justin Patrin " CVSDATE = "${PV}" -PR = "r3" +PR = "r4" SRC_URI = "cvs://anonymous@cvs.sourceforge.net/cvsroot/enlightenment;module=e17/apps/entrance \ file://Xserver.patch;patch=1 \ -- cgit v1.2.3 From 7f4a30d2f320d5b4253ec08abd2d4421a31ffb3b Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Sun, 28 Aug 2005 14:15:06 +0000 Subject: opie-taskbar: add borzoi setting for background and welcome pixmaps --- packages/opie-taskbar/opie-taskbar.inc | 1 + packages/opie-taskbar/opie-taskbar_cvs.bb | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/opie-taskbar/opie-taskbar.inc b/packages/opie-taskbar/opie-taskbar.inc index d9f46af533..56a81a6d6f 100644 --- a/packages/opie-taskbar/opie-taskbar.inc +++ b/packages/opie-taskbar/opie-taskbar.inc @@ -21,6 +21,7 @@ PIXMAP_SIZE = "" PIXMAP_SIZE_c7x0 = "-640x480" PIXMAP_SIZE_spitz = "-640x480" PIXMAP_SIZE_akita = "-640x480" +PIXMAP_SIZE_borzoi = "-640x480" # PIXMAP_SIZE_tosa = "-640x480" PIXMAP_SIZE_simpad = "-800x600" diff --git a/packages/opie-taskbar/opie-taskbar_cvs.bb b/packages/opie-taskbar/opie-taskbar_cvs.bb index ad403c09f1..141596a73d 100644 --- a/packages/opie-taskbar/opie-taskbar_cvs.bb +++ b/packages/opie-taskbar/opie-taskbar_cvs.bb @@ -1,7 +1,7 @@ include ${PN}.inc PV = "1.2.0+cvs-${CVSDATE}" -PR = "r6" +PR = "r7" SRC_URI = "${HANDHELDS_CVS};module=opie/core/apps/calibrate \ ${HANDHELDS_CVS};module=opie/noncore/settings/mediummount \ -- cgit v1.2.3