[oe-commits] org.oe.dev merge of '0f116f3500c10a0c6df76297f3ab887bebb2d8ad'
oe commit
openembedded-commits at lists.openembedded.org
Thu Aug 2 00:16:27 UTC 2007
merge of '0f116f3500c10a0c6df76297f3ab887bebb2d8ad'
and 'dce598404f82b5e5bef1adc1cc1d91fbfc2aecc2'
Author: oe at openembedded.org
Branch: org.openembedded.dev
Revision: e0338d02d700ee80a2e54afc642e9f0e197f8a7a
ViewMTN: http://monotone.openembedded.org/revision.psp?id=e0338d02d700ee80a2e54afc642e9f0e197f8a7a
Files:
1
packages/tasks/task-gpe-apps.bb
packages/tasks/task-gpe-base.bb
packages/tasks/task-gpe-connectivity.bb
packages/tasks/task-gpe-desktopapps.bb
packages/tasks/task-gpe-games.bb
packages/tasks/task-gpe-pim.bb
packages/tasks/task-gpe-sectest.bb
packages/tasks/task-gpe-settings.bb
packages/tasks/task-gpe-web.bb
packages/images/e-image.bb
packages/images/gpe-image.bb
packages/meta/meta-gpe.bb
packages/gtkhtml2/gtkhtml2_cvs.bb
packages/gtkhtml2/gtkhtml2_svn.bb
packages/openmoko2/openmoko-icon-theme-standard_svn.bb
packages/openmoko2/openmoko-icon-theme-standard2_svn.bb
packages/libowl
packages/raw-tools
packages/sato-icon-theme
packages/gaim/pidgin_2.1.0.bb
packages/gtk-engines/gtk-sato-engine_0.1.bb
packages/libowl/libowl_svn.bb
packages/matchbox-themes-extra/matchbox-theme-sato_0.1.bb
packages/openmoko2/openmoko-calculator2_svn.bb
packages/puzzles/oh-puzzles_svn.bb
packages/raw-tools/exiv2_0.15.bb
packages/raw-tools/gtkimageview_1.3.0.bb
packages/raw-tools/libopenraw.inc
packages/raw-tools/libopenraw_0.0.2.bb
packages/raw-tools/ufraw_0.12.bb
packages/sato-icon-theme/sato-icon-theme_0.1.bb
classes/base.bbclass
classes/openmoko2.bbclass
conf/bitbake.conf
conf/distro/openmoko.conf
contrib/mtn2cl/mtn2cl.sh
packages/e17/edje-editor_cvs.bb
packages/e17/edje-viewer_cvs.bb
packages/file/file-native_4.21.bb
packages/gettext/gettext-native_0.14.1.bb
packages/gtk-engines/gtk-sato-engine_svn.bb
packages/images/openmoko-image.bb
packages/matchbox-themes-extra/matchbox-theme-sato_svn.bb
packages/matchbox-themes-extra/matchbox-themes-extra_0.3.bb
packages/matchbox-wm/matchbox-wm_1.2.bb
packages/openmoko-panel-plugins/openmoko-panel-battery_svn.bb
packages/openmoko-panel-plugins/openmoko-panel-bt_svn.bb
packages/openmoko-panel-plugins/openmoko-panel-clock_svn.bb
packages/openmoko-panel-plugins/openmoko-panel-gps_svn.bb
packages/openmoko-panel-plugins/openmoko-panel-gsm_svn.bb
packages/openmoko-panel-plugins/openmoko-panel-mainmenu_svn.bb
packages/openmoko-panel-plugins/openmoko-panel-usb_svn.bb
packages/openmoko2/libmokogsmd2_svn.bb
packages/openmoko2/libmokojournal2_svn.bb
packages/openmoko2/libmokopanelui2_svn.bb
packages/openmoko2/libmokoui2_svn.bb
packages/openmoko2/openmoko-contacts2_svn.bb
packages/openmoko2/openmoko-dialer2_svn.bb
packages/openmoko2/openmoko-feedreader2_svn.bb
packages/openmoko2/openmoko-theme-standard2_svn.bb
packages/openmoko2/openmoko-today2_svn.bb
packages/starling/starling_0.2.bb
packages/starling/starling_svn.bb
packages/tasks/task-openmoko.bb
packages/uboot/u-boot-mkimage-gta01-native_oe.bb
packages/uboot/uboot-gta01_svn.bb
packages/webkit/webkit_svn.bb
Diffs:
#
# mt diff -r0f116f3500c10a0c6df76297f3ab887bebb2d8ad -re0338d02d700ee80a2e54afc642e9f0e197f8a7a
#
#
#
# add_file "packages/tasks/task-gpe-apps.bb"
# content [f9b0521eb9c70cf4c727468de9f158d4862e3913]
#
# add_file "packages/tasks/task-gpe-base.bb"
# content [9264743c4b162e9b8ea0dac22cf9b49c390817ec]
#
# add_file "packages/tasks/task-gpe-connectivity.bb"
# content [56c43e4bde77ad931eb095aadde525e8c8a325e4]
#
# add_file "packages/tasks/task-gpe-desktopapps.bb"
# content [81a2bc87d3c4d7f54827c23561a6a3d789f7db2b]
#
# add_file "packages/tasks/task-gpe-games.bb"
# content [5c5d0cd44736fa92600e96f9cbf0183021fa85dd]
#
# add_file "packages/tasks/task-gpe-pim.bb"
# content [226c8d0060c7c7bc81289d6dbbb78e0ec0c18ac1]
#
# add_file "packages/tasks/task-gpe-sectest.bb"
# content [84fa13529206a1c3f88d6fdffc5da80b79bcd10c]
#
# add_file "packages/tasks/task-gpe-settings.bb"
# content [e2954cba1dede6e2a966fbf9589afbd2de1cb6d7]
#
# add_file "packages/tasks/task-gpe-web.bb"
# content [0a675047bd8b7c48761317cbcded83167b1800d4]
#
# patch "packages/images/e-image.bb"
# from [326b9f58a409f5e386ceae400e851a72a65d9669]
# to [335b0fd609b4b88b8939987c8e319d1b19d6c062]
#
# patch "packages/images/gpe-image.bb"
# from [a8b141d9c5c74bb6069d99aefc3d4d5c343933af]
# to [2afcf7bd5400d5741f5783ab36b367b9c329ebb8]
#
# patch "packages/meta/meta-gpe.bb"
# from [c482e70facadcbb086ed54340e520838999241c8]
# to [6100242445754540e50f04fc1076c43a1ae36c29]
#
============================================================
--- packages/tasks/task-gpe-apps.bb f9b0521eb9c70cf4c727468de9f158d4862e3913
+++ packages/tasks/task-gpe-apps.bb f9b0521eb9c70cf4c727468de9f158d4862e3913
@@ -0,0 +1,24 @@
+DESCRIPTION = "Application task package for GPE Palmtop Environment"
+PR = "r5"
+LICENSE = "MIT"
+ALLOW_EMPTY = "1"
+
+RDEPENDS = "\
+ gpe-edit \
+ gpe-gallery \
+ gpe-calculator \
+ gpe-clock \
+ gpe-plucker \
+ gpe-terminal \
+ gpe-watch \
+ gpe-what \
+ matchbox-panel-hacks \
+ gpe-aerial \
+ rosetta \
+ gpe-scap \
+ gpe-windowlist \
+ gpe-filemanager \
+ gpe-soundbite \
+ mbmerlin \
+ starling"
+
============================================================
--- packages/tasks/task-gpe-base.bb 9264743c4b162e9b8ea0dac22cf9b49c390817ec
+++ packages/tasks/task-gpe-base.bb 9264743c4b162e9b8ea0dac22cf9b49c390817ec
@@ -0,0 +1,39 @@
+DESCRIPTION = "Base task package for GPE Palmtop Environment"
+PR = "r5"
+LICENSE = "MIT"
+ALLOW_EMPTY = "1"
+
+RDEPENDS = "\
+ diet-x11 \
+ virtual/xserver \
+ gpe-bootsplash \
+ bluez-utils-dbus \
+ matchbox \
+ xcursor-transparent-theme \
+ rxvt-unicode \
+ gtk2-theme-angelistic \
+ matchbox-themes-gtk \
+ xst \
+ xhost \
+ xrdb \
+ gpe-soundserver \
+ gpe-dm \
+ gpe-login \
+ gpe-session-scripts \
+ gpe-icons \
+ gpe-confd \
+ gpe-autostarter \
+ startup-monitor \
+ libgtkstylus \
+ suspend-desktop \
+ teleport \
+ xauth \
+ gdk-pixbuf-loader-png \
+ gdk-pixbuf-loader-xpm \
+ gdk-pixbuf-loader-jpeg \
+ pango-module-basic-x \
+ pango-module-basic-fc \
+ ttf-dejavu-sans \
+ ttf-dejavu-sans-mono \
+ ttf-dejavu-serif"
+
============================================================
--- packages/tasks/task-gpe-connectivity.bb 56c43e4bde77ad931eb095aadde525e8c8a325e4
+++ packages/tasks/task-gpe-connectivity.bb 56c43e4bde77ad931eb095aadde525e8c8a325e4
@@ -0,0 +1,9 @@
+DESCRIPTION = "Connectivity task packages for GPE Palmtop Environment"
+PR = "r5"
+LICENSE = "MIT"
+ALLOW_EMPTY = "1"
+
+RDEPENDS = "\
+ gpe-mini-browser \
+ gpe-irc"
+
============================================================
--- packages/tasks/task-gpe-desktopapps.bb 81a2bc87d3c4d7f54827c23561a6a3d789f7db2b
+++ packages/tasks/task-gpe-desktopapps.bb 81a2bc87d3c4d7f54827c23561a6a3d789f7db2b
@@ -0,0 +1,13 @@
+DESCRIPTION = "Additional desktop applications package for GPE Palmtop Environment"
+PR = "r5"
+LICENSE = "MIT"
+ALLOW_EMPTY = "1"
+
+RDEPENDS = "\
+ sylpheed \
+ firefox \
+ thunderbird \
+ galculator \
+ gnumeric \
+ gpdf"
+
============================================================
--- packages/tasks/task-gpe-games.bb 5c5d0cd44736fa92600e96f9cbf0183021fa85dd
+++ packages/tasks/task-gpe-games.bb 5c5d0cd44736fa92600e96f9cbf0183021fa85dd
@@ -0,0 +1,13 @@
+DESCRIPTION = "Games task package for GPE Palmtop Environment"
+PR = "r5"
+LICENSE = "MIT"
+ALLOW_EMPTY = "1"
+
+RDEPENDS = "\
+ gpe-go \
+ gpe-lights \
+ gpe-othello \
+ gpe-tetris \
+ gsoko \
+ xdemineur"
+
============================================================
--- packages/tasks/task-gpe-pim.bb 226c8d0060c7c7bc81289d6dbbb78e0ec0c18ac1
+++ packages/tasks/task-gpe-pim.bb 226c8d0060c7c7bc81289d6dbbb78e0ec0c18ac1
@@ -0,0 +1,18 @@
+DESCRIPTION = "PIM task packages for GPE Palmtop Environment"
+PR = "r5"
+LICENSE = "MIT"
+ALLOW_EMPTY = "1"
+
+RDEPENDS_gpe-task-pim = "\
+ gpe-timesheet \
+ gpe-todo \
+ gpe-calendar \
+ gpe-sketchbook \
+ gpe-contacts \
+ gpe-synctool \
+ gpesyncd \
+ miniclipboard"
+
+# broken gpe-today \
+
+
============================================================
--- packages/tasks/task-gpe-sectest.bb 84fa13529206a1c3f88d6fdffc5da80b79bcd10c
+++ packages/tasks/task-gpe-sectest.bb 84fa13529206a1c3f88d6fdffc5da80b79bcd10c
@@ -0,0 +1,17 @@
+DESCRIPTION = "Security testing task packages for GPE Palmtop Environment"
+PR = "r5"
+LICENSE = "MIT"
+ALLOW_EMPTY = "1"
+
+RDEPENDS = "\
+ nmap \
+ ettercap \
+ stunnel \
+ curl \
+ dsniff \
+ prismstumbler \
+ tcpdump \
+ kismet \
+ hydra \
+ thcrut"
+
============================================================
--- packages/tasks/task-gpe-settings.bb e2954cba1dede6e2a966fbf9589afbd2de1cb6d7
+++ packages/tasks/task-gpe-settings.bb e2954cba1dede6e2a966fbf9589afbd2de1cb6d7
@@ -0,0 +1,22 @@
+DESCRIPTION = "Settings task package for GPE Palmtop Environment"
+PR = "r5"
+LICENSE = "MIT"
+ALLOW_EMPTY = "1"
+
+RDEPENDS = "\
+ gpe-mininet \
+ gpe-bluetooth \
+ gpe-beam \
+ matchbox-panel-manager \
+ gpe-su \
+ gpe-conf \
+ gpe-clock \
+ gpe-mixer \
+ gpe-package \
+ gpe-shield \
+ gpe-taskmanager \
+ keylaunch \
+ minilite \
+ minimix \
+ xmonobut"
+
============================================================
--- packages/tasks/task-gpe-web.bb 0a675047bd8b7c48761317cbcded83167b1800d4
+++ packages/tasks/task-gpe-web.bb 0a675047bd8b7c48761317cbcded83167b1800d4
@@ -0,0 +1,10 @@
+DESCRIPTION = "Additional web task packages for GPE Palmtop Environment"
+PR = "r5"
+LICENSE = "MIT"
+ALLOW_EMPTY = "1"
+
+
+RDEPENDS = "\
+ pidgin \
+ minimo"
+
============================================================
--- packages/images/e-image.bb 326b9f58a409f5e386ceae400e851a72a65d9669
+++ packages/images/e-image.bb 335b0fd609b4b88b8939987c8e319d1b19d6c062
@@ -1,15 +1,15 @@ DESCRIPTION = "An X11-based distribution
require e-image-core.bb
DESCRIPTION = "An X11-based distribution with the Enlightenment Window Manager and Tools"
-PR = "r5"
+PR = "r6"
export IMAGE_BASENAME = "e-image"
export PACKAGE_INSTALL += "task-e-x11-core \
- gpe-task-pim \
- gpe-task-settings \
- gpe-task-apps \
- gpe-task-connectivity \
- gpe-task-games \
- gpe-task-apps-extra \
+ ask-gpe-pim \
+ task-gpe-settings \
+ task-gpe-apps \
+ task-gpe-connectivity \
+ task-gpe-games \
+ task-apps-extra \
figment \
xhost \
gpe-soundserver \
@@ -23,13 +23,8 @@ export PACKAGE_INSTALL += "task-e-x11-co
gdk-pixbuf-loader-pnm \
gdk-pixbuf-loader-xbm \
gdk-pixbuf-loader-xpm"
-# gdk-pixbuf-loader-pcx \
-# gdk-pixbuf-loader-ico \
-# gdk-pixbuf-loader-ani \
-# gdk-pixbuf-loader-ras \
-# gdk-pixbuf-loader-tga \
-# gdk-pixbuf-loader-wbmp \
-DEPENDS += "task-e-x11-core task-gpe figment xhost gpe-soundserver gpe-confd xauth"
+DEPENDS += "task-e-x11-core task-gpe-base task-gpe-pim task-gpe-settings task-gpe-apps task-gpe-connectivity task-gpe-games \
+ figment xhost gpe-soundserver gpe-confd xauth"
RDEPENDS = "${PACKAGE_INSTALL}"
============================================================
--- packages/images/gpe-image.bb a8b141d9c5c74bb6069d99aefc3d4d5c343933af
+++ packages/images/gpe-image.bb 2afcf7bd5400d5741f5783ab36b367b9c329ebb8
@@ -1,20 +1,20 @@
-PR = "r20"
+PR = "r21"
export IMAGE_BASENAME = "gpe-image"
GPE_EXTRA_THEMES = "gpe-theme-industrial"
GPE_EXTRA_INSTALL_none = ""
-GPE_EXTRA_INSTALL_bigscreen = "gpe-task-games ${GPE_EXTRA_THEMES}"
-GPE_EXTRA_INSTALL_smallscreen = "gpe-task-games ${GPE_EXTRA_THEMES}"
+GPE_EXTRA_INSTALL_bigscreen = "task-gpe-games ${GPE_EXTRA_THEMES}"
+GPE_EXTRA_INSTALL_smallscreen = "task-gpe-games ${GPE_EXTRA_THEMES}"
GUI_MACHINE_CLASS ?= "none"
GPE_EXTRA_INSTALL += "${GPE_EXTRA_INSTALL_${GUI_MACHINE_CLASS}}"
#ship more stuff with devices with >16MB of flash
GPE_BIGFLASH_INSTALL := '${@base_conditional("ROOT_FLASH_SIZE", "16", "", "\
- gpe-task-connectivity \
+ task-gpe-connectivity \
gpe-theme-clearlooks \
figment \
",d)}'
@@ -23,15 +23,15 @@ XSERVER ?= "xserver-kdrive-fbdev"
XSERVER ?= "xserver-kdrive-fbdev"
-DEPENDS = "${MACHINE_TASK_PROVIDER} task-gpe"
+DEPENDS = "${MACHINE_TASK_PROVIDER} task-gpe-base task-gpe-apps task-gpe-pim task-gpe-settings task-gpe-games"
RDEPENDS = "${PACKAGE_INSTALL}"
export PACKAGE_INSTALL = "\
${MACHINE_TASK_PROVIDER} \
- gpe-task-base \
- gpe-task-pim \
- gpe-task-settings \
- gpe-task-apps \
+ task-gpe-base \
+ task-gpe-pim \
+ task-gpe-settings \
+ task-gpe-apps \
${XSERVER} \
${GPE_EXTRA_INSTALL}"
============================================================
--- packages/meta/meta-gpe.bb c482e70facadcbb086ed54340e520838999241c8
+++ packages/meta/meta-gpe.bb 6100242445754540e50f04fc1076c43a1ae36c29
@@ -1,14 +1,13 @@ LICENSE = "MIT"
DESCRIPTION = "Meta-package for GPE Palmtop Environment"
LICENSE = "MIT"
-PR = "r42"
+PR = "r43"
RDEPENDS = "\
- gpe-base-depends \
- gpe-task-base \
- gpe-task-settings \
- gpe-task-pim \
- gpe-task-apps \
- gpe-task-games \
- gpe-task-connectivity"
+ task-gpe-base \
+ task-gpe-settings \
+ task-gpe-pim \
+ task-gpe-apps \
+ task-gpe-games \
+ task-gpe-connectivity"
inherit meta
#
# mt diff -rdce598404f82b5e5bef1adc1cc1d91fbfc2aecc2 -re0338d02d700ee80a2e54afc642e9f0e197f8a7a
#
#
#
# rename "packages/gtkhtml2/gtkhtml2_cvs.bb"
# to "packages/gtkhtml2/gtkhtml2_svn.bb"
#
# rename "packages/openmoko2/openmoko-icon-theme-standard_svn.bb"
# to "packages/openmoko2/openmoko-icon-theme-standard2_svn.bb"
#
# add_dir "packages/libowl"
#
# add_dir "packages/raw-tools"
#
# add_dir "packages/sato-icon-theme"
#
# add_file "packages/gaim/pidgin_2.1.0.bb"
# content [f38dd9af51ab37706164482bcece1477daca655a]
#
# add_file "packages/gtk-engines/gtk-sato-engine_0.1.bb"
# content [ab07dcf998c172180c91d56f72e796d8aeeab305]
#
# add_file "packages/libowl/libowl_svn.bb"
# content [3130df44fd115dea07f7f96a3b64bc622176da7f]
#
# add_file "packages/matchbox-themes-extra/matchbox-theme-sato_0.1.bb"
# content [2db6bccdcaa7c47633da7c783230c2eae6495c18]
#
# add_file "packages/openmoko2/openmoko-calculator2_svn.bb"
# content [64eba89e85f82eb9dfff97ba06635e4346bedd50]
#
# add_file "packages/puzzles/oh-puzzles_svn.bb"
# content [49224067698adffd6aaa85ac7ba650a497ef66bc]
#
# add_file "packages/raw-tools/exiv2_0.15.bb"
# content [2b311c71bf140f8fe814a329c5e0d6f7c035d74e]
#
# add_file "packages/raw-tools/gtkimageview_1.3.0.bb"
# content [8f6abcf017161c97a74536827415084e0ba3e0de]
#
# add_file "packages/raw-tools/libopenraw.inc"
# content [07bad36a84568656e31ac55773ee958dec4bea9b]
#
# add_file "packages/raw-tools/libopenraw_0.0.2.bb"
# content [2e36b5e5ffaccfb2f7b16a46033e547453f85382]
#
# add_file "packages/raw-tools/ufraw_0.12.bb"
# content [9c3d6f30697f55a63998a1efeea24dad4bdddf2e]
#
# add_file "packages/sato-icon-theme/sato-icon-theme_0.1.bb"
# content [bf3b1c4cbcec19f4f75318b72873bffa341790dc]
#
# patch "classes/base.bbclass"
# from [8ae82b899b740b9da403e698610bf6ca49f8e64c]
# to [26453f8831d23d5ae6400f403116c9272347807d]
#
# patch "classes/openmoko2.bbclass"
# from [80c28ba30fcb1a7997d64595641141f1a49e3c68]
# to [465a2fdbdaa8a9f2d258d0f3db274cf06b6ae722]
#
# patch "conf/bitbake.conf"
# from [ee130e54dc68eb5516e965696fbced464a542166]
# to [d7da259bfd8ea8f8052f4258ba7b9c6e58a864ef]
#
# patch "conf/distro/openmoko.conf"
# from [3301ae1374b3e083a581693e45861ad90a73ea39]
# to [5be15b63c7d76afbff22878ff4c51b995922ff5f]
#
# patch "contrib/mtn2cl/mtn2cl.sh"
# from [89788c2d8ed63aa5ab3469b7c152d93de8ec1af6]
# to [d4794a871ac74f519ca7da827b1a964c47882a62]
#
# patch "packages/e17/edje-editor_cvs.bb"
# from [740c05ae1ecafcda56ba3f18f5b2fe0dac6332be]
# to [cfa6ec43d5f9faae882abbe2efa486f7fa6523f3]
#
# patch "packages/e17/edje-viewer_cvs.bb"
# from [2a7237f77298295dcb9a891068279c010aea803f]
# to [a789e404a347e1eedc48636e834ce762cb837e4a]
#
# patch "packages/file/file-native_4.21.bb"
# from [7f56042d15332b2149b6e86a6180dd1e4707ae80]
# to [29075960c23f8de964fe35362d349c591f2b870f]
#
# patch "packages/gettext/gettext-native_0.14.1.bb"
# from [6ce9f64a18de045ab3ddf5281ba2dfd85df5767b]
# to [5573b70e6cbee4dc9639ecbef5e47e8c411d325c]
#
# patch "packages/gtk-engines/gtk-sato-engine_svn.bb"
# from [ec964b5bc48272499441a2965cd1787a438b6b10]
# to [61ab85e6cb2d62d53d38b99e5c8dbd90aaf0cf7c]
#
# patch "packages/images/openmoko-image.bb"
# from [9ebccfa80e88143c38645f7f13c90a3a90e51288]
# to [baa68f491ce9ac84c3a47b7904190c6b594cb0ef]
#
# patch "packages/matchbox-themes-extra/matchbox-theme-sato_svn.bb"
# from [be97546fdbeebbe06f13772f2cc2b4f816d142e3]
# to [52fb3dd027f65d3b4622d23994762afcd09eac92]
#
# patch "packages/matchbox-themes-extra/matchbox-themes-extra_0.3.bb"
# from [a0dd20d0b1db03e1557c88327a71f3b5e8e8caa4]
# to [6aeedd98fc8fd9abdee841879b6723267b896da3]
#
# patch "packages/matchbox-wm/matchbox-wm_1.2.bb"
# from [fa3b0b72595b3260baae19fd70ffd06279f222e7]
# to [f76c8f85daaf9e0782a8d564dcc1b6e906534b7a]
#
# patch "packages/openmoko-panel-plugins/openmoko-panel-battery_svn.bb"
# from [9e3bcc0a584850f07d72044109a2899acd5f3b67]
# to [aea7b4780c1ef56b1525907e84e9cdc7800a372a]
#
# patch "packages/openmoko-panel-plugins/openmoko-panel-bt_svn.bb"
# from [90ba0eb3822a476f4a0af3ddf3a3f27daefbe6e3]
# to [26148603ad12255f81061a7c63029fbc575538db]
#
# patch "packages/openmoko-panel-plugins/openmoko-panel-clock_svn.bb"
# from [a3f3992317c4b916878d25e7d812bcdff5d7a8ed]
# to [c45f118fea9d9056538bb5598221f1f0342a98d1]
#
# patch "packages/openmoko-panel-plugins/openmoko-panel-gps_svn.bb"
# from [5de3b990934d46c8128c805202ce21d19cb21895]
# to [612639ea089431473f3ec9da7c8d49bae7ca79df]
#
# patch "packages/openmoko-panel-plugins/openmoko-panel-gsm_svn.bb"
# from [d10c6b1d36d72f3b3c8049d1bb2159c96ab7c45b]
# to [594e28e126038d100ac65fbc93c8beb75bc46b08]
#
# patch "packages/openmoko-panel-plugins/openmoko-panel-mainmenu_svn.bb"
# from [260a4ef2e7491dfc23d96d055a0a0e1ed674ee54]
# to [7304fa83f04a875f8423c542adaeefd30b767ddf]
#
# patch "packages/openmoko-panel-plugins/openmoko-panel-usb_svn.bb"
# from [695d1da5d037f26533a81987819cfee7a9df7601]
# to [0ccabfca2ec3a05bd1e2ee7bb7ec38f68e0cc95d]
#
# patch "packages/openmoko2/libmokogsmd2_svn.bb"
# from [fdaa954512eb9af1f964483f9c2fc585cb677608]
# to [37257745643dc337dbe76f5c6b0c8c55883fa32b]
#
# patch "packages/openmoko2/libmokojournal2_svn.bb"
# from [15b332f5c75a6f64de12d666bf71409ae4ab8999]
# to [0f61c6ecb80a04d697a6afc1662a38f3b2bce2b8]
#
# patch "packages/openmoko2/libmokopanelui2_svn.bb"
# from [cae0414648cd159c9b09a353cb29019fdf139af7]
# to [27d2e62425fa7629097814a33d11aad51c5b6f52]
#
# patch "packages/openmoko2/libmokoui2_svn.bb"
# from [fc8c35f6eb460dc277d372d31baffef3c4b04d52]
# to [5d4e43536cf9cddc41d7d438ea815bcde15f84ad]
#
# patch "packages/openmoko2/openmoko-contacts2_svn.bb"
# from [fe8ddc379d3397d04fcb2bf58940316edb474428]
# to [75970f318e57d74e7bd9d365d50cb58a4022209f]
#
# patch "packages/openmoko2/openmoko-dialer2_svn.bb"
# from [10449f420626a2dc7eb7ffddcdc2588946e18e7f]
# to [bd0cf06b6716271a14903834f2eec8860e79c71d]
#
# patch "packages/openmoko2/openmoko-feedreader2_svn.bb"
# from [a5066ba7ccf9101b4635687704d2ecca47441fa2]
# to [34a51029c8d3cff7ef8ded80931fca00a22a14a2]
#
# patch "packages/openmoko2/openmoko-icon-theme-standard2_svn.bb"
# from [3889e0cbc8b415f8ccc206cf34c0b2d3f5324e5b]
# to [99f8863ea49eb790acf83271ef41bb984b9bb9f6]
#
# patch "packages/openmoko2/openmoko-theme-standard2_svn.bb"
# from [fe0910c4f9d4b2220369f293fdf57c3fcb0b1bf4]
# to [1f363d64742737bc103dabdfe8ea7079ea768b49]
#
# patch "packages/openmoko2/openmoko-today2_svn.bb"
# from [19b5a82e4b9df73c893f35975ee0e6717ea38027]
# to [9bd8fe5b88a3bd55ba28bbdb66afae33f5019c20]
#
# patch "packages/starling/starling_0.2.bb"
# from [1289158f34b79de9d3820f8c6022a7107c0cb99a]
# to [9d0522f1342ae339228f0a79a466835a9483cb9c]
#
# patch "packages/starling/starling_svn.bb"
# from [6486e2268453d17257250749dc505d0f9325d01e]
# to [41c225219a46f25d88d800d602cfc111847d3a8b]
#
# patch "packages/tasks/task-openmoko.bb"
# from [a87ce3caddce4b12644a8550b43e5aaa8989d5d8]
# to [d6daadd4be13a618f792c38b29c7ba72fb80da73]
#
# patch "packages/uboot/u-boot-mkimage-gta01-native_oe.bb"
# from [148eadcd4b31c1fc73879e61409c8db14331aaeb]
# to [d2ac07afa8091ccc0ab72e917cab17dad786d31e]
#
# patch "packages/uboot/uboot-gta01_svn.bb"
# from [62211a5a9b706926a1f230401f042f8add732e37]
# to [32eb07ab20fbe4bfcde0f6e323b372dcbb347192]
#
# patch "packages/webkit/webkit_svn.bb"
# from [2a5fcb37237fbc5d9d76134e97ba8b23dcfe8948]
# to [cb5b674496bc18948802b1c9b8f634d574e64268]
#
============================================================
--- packages/gaim/pidgin_2.1.0.bb f38dd9af51ab37706164482bcece1477daca655a
+++ packages/gaim/pidgin_2.1.0.bb f38dd9af51ab37706164482bcece1477daca655a
@@ -0,0 +1,9 @@
+require pidgin.inc
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/pidgin/pidgin-${PV}.tar.bz2 \
+ file://sanitize-configure.ac.patch;patch=1 \
+ file://gconf-no-errors.patch;patch=1 \
+ file://pidgin.desktop-set-icon.patch;patch=1 \
+ "
+
+PR = "r0"
============================================================
--- packages/gtk-engines/gtk-sato-engine_0.1.bb ab07dcf998c172180c91d56f72e796d8aeeab305
+++ packages/gtk-engines/gtk-sato-engine_0.1.bb ab07dcf998c172180c91d56f72e796d8aeeab305
@@ -0,0 +1,26 @@
+SECTION = "x11/base"
+DESCRIPTION = "Sato theme engine for GTK"
+LICENSE = "LGPL"
+DEPENDS = "gtk+"
+PR = "r0"
+
+SRC_URI = "http://pokylinux.org/releases/sato/sato-engine-0.1.tar.gz"
+S = "${WORKDIR}/sato-engine-0.1"
+
+inherit autotools pkgconfig
+
+do_configure_prepend() {
+ for i in `ls gtk-common`; do
+ ln -sf ../gtk-common/$i gtk2-engine/$i
+ done
+}
+
+PACKAGES += "gtk-theme-sato"
+FILES_${PN} = "${libdir}/gtk-2.0/*/engines/*.so "
+FILES_${PN}-dev = "${libdir}/gtk-2.0/*/engines/*"
+FILES_${PN}-dbg = "${libdir}/gtk-2.0/*/engines/.debug"
+FILES_gtk-theme-sato = "${datadir}/icons ${datadir}/themes"
+
+RDEPENDS_gtk-theme-sato = "${PN}"
+
+
============================================================
--- packages/libowl/libowl_svn.bb 3130df44fd115dea07f7f96a3b64bc622176da7f
+++ packages/libowl/libowl_svn.bb 3130df44fd115dea07f7f96a3b64bc622176da7f
@@ -0,0 +1,48 @@
+# This recipe builds libowl and then stages the header and static lib;
+# it intentionally does not stage the shared lib and create a package.
+#
+# Libowl is currently a 'cut and paste' library; this package makes our
+# life a touch easier by not having to patch the source directly into
+# applications; instead we add -lowl to the linker cmdline. Also, when
+# we eventually make libowl into a normal shared library, this package
+# will make that transition rather simple.
+
+DESCRIPTION = "OpenedHand Widget Library"
+HOMEPAGE = "http://www.o-hand.com"
+LICENSE = "LGPL"
+SECTION = "libs"
+PR = "r3"
+PV = "0.0+svn${SRCDATE}"
+
+DEPENDS = "gtk+ glib-2.0"
+PACKAGES = ""
+
+SRC_URI = "svn://svn.o-hand.com/repos/misc/trunk;module=${PN};proto=http"
+
+S = "${WORKDIR}/${PN}"
+
+inherit autotools pkgconfig
+
+do_compile_prepend() {
+ # have to unstage the library first so that the tests build
+ rm -f ${STAGING_LIBDIR}/libowl*
+ rm -f ${STAGING_INCDIR}/owl*
+}
+
+do_stage() {
+ headers=`eval ls libowl/owl*.h`
+ for header in $headers; do
+ hdr_base=`eval basename $header`
+ install -m 644 $header ${STAGING_INCDIR}/$hdr_base
+ done
+ install -m 644 libowl/.libs/libowl.a ${STAGING_LIBDIR}/
+}
+
+do_install() {
+}
+
+do_package() {
+}
+
+do_package_write() {
+}
============================================================
--- packages/matchbox-themes-extra/matchbox-theme-sato_0.1.bb 2db6bccdcaa7c47633da7c783230c2eae6495c18
+++ packages/matchbox-themes-extra/matchbox-theme-sato_0.1.bb 2db6bccdcaa7c47633da7c783230c2eae6495c18
@@ -0,0 +1,13 @@
+DESCRIPTION = "Matchbox window manager Sato themes"
+LICENSE = "CC-BY-SA3"
+DEPENDS = "matchbox-wm"
+SECTION = "x11/wm"
+
+PACKAGE_ARCH = "all"
+
+SRC_URI = "http://pokylinux.org/releases/sato/matchbox-theme-sato-0.1.tar.gz"
+
+inherit autotools pkgconfig
+
+FILES_${PN} += "${datadir}/themes"
+
============================================================
--- packages/openmoko2/openmoko-calculator2_svn.bb 64eba89e85f82eb9dfff97ba06635e4346bedd50
+++ packages/openmoko2/openmoko-calculator2_svn.bb 64eba89e85f82eb9dfff97ba06635e4346bedd50
@@ -0,0 +1,7 @@
+DESCRIPTION = "A Calculator for OpenMoko"
+SECTION = "openmoko/tools"
+DEPENDS = "libmokoui2"
+PV = "0.1.0+svnr${SRCREV}"
+PR = "r0"
+
+inherit openmoko2
============================================================
--- packages/puzzles/oh-puzzles_svn.bb 49224067698adffd6aaa85ac7ba650a497ef66bc
+++ packages/puzzles/oh-puzzles_svn.bb 49224067698adffd6aaa85ac7ba650a497ef66bc
@@ -0,0 +1,43 @@
+DESCRIPTION = "Portable Puzzle Collection"
+LICENSE = "MIT"
+SECTION = "x11"
+DEPENDS = "gtk+ gconf intltool-native librsvg libowl"
+PV = "0.1+svn${SRCDATE}"
+PR = "r5"
+
+inherit autotools pkgconfig
+
+SRC_URI = "svn://svn.o-hand.com/repos/;module=oh-puzzles;proto=http"
+S = "${WORKDIR}/${PN}"
+
+do_install_append() {
+ mv ${D}${bindir} ${D}/usr/games
+
+ install -d ${D}/${datadir}/applications/
+
+ cd ${D}/${prefix}/games
+ for prog in *; do
+ if [ -x $prog ]; then
+ # Convert prog to Title Case
+ title=$(echo $prog | sed 's/\(^\| \)./\U&/g')
+ echo "making ${D}/${datadir}/applications/$prog.desktop"
+ cat <<STOP > ${D}/${datadir}/applications/$prog.desktop
+[Desktop Entry]
+Encoding=UTF-8
+Name=$title
+Exec=${prefix}/games/$prog
+Icon=applications-games
+Terminal=false
+Type=Application
+Categories=Game
+StartupNotify=true
+SingleInstance=true
+Comment=Play $title.
+STOP
+ fi
+ done
+}
+
+FILES_${PN} += "${prefix}/games/*"
+FILES_${PN}-dbg += "${prefix}/games/.debug/*"
+
============================================================
--- packages/raw-tools/exiv2_0.15.bb 2b311c71bf140f8fe814a329c5e0d6f7c035d74e
+++ packages/raw-tools/exiv2_0.15.bb 2b311c71bf140f8fe814a329c5e0d6f7c035d74e
@@ -0,0 +1,14 @@
+DESCRIPTION = "Exiv2 is a C++ library and a command line utility to access image metadata."
+LICENSE = "GPL"
+DEPENDS = "tiff zlib"
+
+SRC_URI = "http://www.exiv2.org/exiv2-${PV}.tar.gz"
+
+inherit autotools pkgconfig lib_package
+
+
+do_stage() {
+ autotools_stage_all
+}
+
+
============================================================
--- packages/raw-tools/gtkimageview_1.3.0.bb 8f6abcf017161c97a74536827415084e0ba3e0de
+++ packages/raw-tools/gtkimageview_1.3.0.bb 8f6abcf017161c97a74536827415084e0ba3e0de
@@ -0,0 +1,19 @@
+DESCRIPTION = "GtkImageView is a simple image viewer widget for GTK."
+DEPENDS = "gtk+"
+
+SRC_URI = "http://www.angstrom-distribution.org/unstable/sources/gtkimageview-${PV}.tar.gz"
+
+inherit autotools pkgconfig
+
+
+do_configure() {
+ gnu-configize
+ libtoolize --force
+ oe_runconf
+}
+
+do_stage() {
+ autotools_stage_all
+}
+
+
============================================================
--- packages/raw-tools/libopenraw.inc 07bad36a84568656e31ac55773ee958dec4bea9b
+++ packages/raw-tools/libopenraw.inc 07bad36a84568656e31ac55773ee958dec4bea9b
@@ -0,0 +1,10 @@
+DESCRIPTION = "libopenraw is an ongoing project to provide a free software implementation for camera RAW files decoding. "
+LICENSE = "GPLv2"
+DEPENDS = "boost jpeg gtk+"
+
+inherit autotools pkgconfig lib_package
+
+PACKAGES =+ "libopenrawgnome"
+
+FILES_libopenrawgnome = "${libdir}/libopenrawgnome.so.*"
+
============================================================
--- packages/raw-tools/libopenraw_0.0.2.bb 2e36b5e5ffaccfb2f7b16a46033e547453f85382
+++ packages/raw-tools/libopenraw_0.0.2.bb 2e36b5e5ffaccfb2f7b16a46033e547453f85382
@@ -0,0 +1,4 @@
+require libopenraw.inc
+
+SRC_URI = "http://libopenraw.freedesktop.org/download/libopenraw-${PV}.tar.gz"
+
============================================================
--- packages/raw-tools/ufraw_0.12.bb 9c3d6f30697f55a63998a1efeea24dad4bdddf2e
+++ packages/raw-tools/ufraw_0.12.bb 9c3d6f30697f55a63998a1efeea24dad4bdddf2e
@@ -0,0 +1,16 @@
+DESCRIPTION = "The Unidentified Flying Raw (UFRaw) is a utility to read and manipulate raw images from digital cameras. "
+LICENSE = "GPL"
+
+DEPENDS = "gtk+ gtkimageview lcms exiv2 tiff"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/ufraw/ufraw-${PV}.tar.gz"
+
+inherit autotools pkgconfig
+
+EXTRA_OECONF = " --enable-extras "
+
+PACKAGES =+ "dcraw dcraw-dbg"
+FILES_dcraw = "${bindir}/dcraw"
+FILES_dcraw-bdg = "${bindir}/.debug/dcraw"
+
+
============================================================
--- packages/sato-icon-theme/sato-icon-theme_0.1.bb bf3b1c4cbcec19f4f75318b72873bffa341790dc
+++ packages/sato-icon-theme/sato-icon-theme_0.1.bb bf3b1c4cbcec19f4f75318b72873bffa341790dc
@@ -0,0 +1,20 @@
+SECTION = "x11"
+DESCRIPTION = "Sato Icon Theme"
+LICENSE = "CC-BY-SA3"
+DEPENDS = ""
+
+PACKAGE_ARCH = "all"
+
+SRC_URI = "http://pokylinux.org/releases/sato/sato-icon-theme-${PV}.tar.gz"
+
+inherit autotools pkgconfig
+
+pkg_postinst_${PN} () {
+ if [ "x$D" != "x" ]; then
+ exit 1
+ fi
+ gtk-update-icon-cache -q /usr/share/icons/Sato
+}
+
+FILES_${PN} += "${datadir}"
+
============================================================
--- classes/base.bbclass 8ae82b899b740b9da403e698610bf6ca49f8e64c
+++ classes/base.bbclass 26453f8831d23d5ae6400f403116c9272347807d
@@ -892,6 +892,13 @@ python () {
base_after_parse(d)
}
+# Remove me when we switch to bitbake 1.8.8
+def base_get_srcrev(d):
+ import %s
>>> DIFF TRUNCATED @ 16K
More information about the Openembedded-commits
mailing list