import clean BK tree at cset 1.3670

14 files changed, 265 insertions, 0 deletions

diff --git a/packages/matchbox-panel/.mtn2git_empty b/packages/matchbox-panel/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/matchbox-panel/.mtn2git_empty
diff --git a/packages/matchbox-panel/matchbox-panel-0.8.1/.mtn2git_empty b/packages/matchbox-panel/matchbox-panel-0.8.1/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/matchbox-panel/matchbox-panel-0.8.1/.mtn2git_empty
diff --git a/packages/matchbox-panel/matchbox-panel-0.8.1/automake-lossage.patch b/packages/matchbox-panel/matchbox-panel-0.8.1/automake-lossage.patch
index e69de29bb2..b8a8613779 100644
--- a/packages/matchbox-panel/matchbox-panel-0.8.1/automake-lossage.patch
+++ b/packages/matchbox-panel/matchbox-panel-0.8.1/automake-lossage.patch
@@ -0,0 +1,20 @@
+diff -urNa matchbox-panel-0.8.1/applets/Makefile.am matchbox-panel-0.8.1-patched/applets/Makefile.am
+--- matchbox-panel-0.8.1/applets/Makefile.am	2004-02-07 12:48:56.000000000 -0500
++++ matchbox-panel-0.8.1-patched/applets/Makefile.am	2004-06-15 21:15:30.000000000 -0400
+@@ -12,10 +12,12 @@
+ bin_PROGRAMS =                                                    \
+   mb-applet-clock    mb-applet-menu-launcher  mb-applet-wireless  \
+   mb-applet-launcher mb-applet-system-monitor mb-applet-battery
+-
+-  mb_applet_battery_SOURCES =        mb-applet-battery.c
+-  mb_applet_battery_LDADD   =        $(LIBMB_LIBS) $(SN_LIBS) -lapm  
+-
++mb_applet_battery_SOURCES =        mb-applet-battery.c
++mb_applet_battery_OBJECTS =        mb-applet-battery.$(OBJEXT)
++mb_applet_battery_LDADD   =        $(LIBMB_LIBS) $(SN_LIBS) -lapm  
++mb-applet-battery$(EXEEXT): $(mb_applet_battery_OBJECTS) 
++	@rm -f mb-applet-battery$(EXEEXT)
++	$(LINK) $(mb_applet_battery_LDFLAGS) $(mb_applet_battery_OBJECTS) $(mb_applet_battery_LDADD) $(LIBS)
+ else
+ bin_PROGRAMS =                                                    \
+   mb-applet-clock    mb-applet-menu-launcher  mb-applet-wireless  \
diff --git a/packages/matchbox-panel/matchbox-panel-0.8.1/make-batteryapp-less-strict.patch b/packages/matchbox-panel/matchbox-panel-0.8.1/make-batteryapp-less-strict.patch
index e69de29bb2..45bff32b9a 100644
--- a/packages/matchbox-panel/matchbox-panel-0.8.1/make-batteryapp-less-strict.patch
+++ b/packages/matchbox-panel/matchbox-panel-0.8.1/make-batteryapp-less-strict.patch
@@ -0,0 +1,13 @@
+diff -urNd ../matchbox-panel-0.8.1-r4/matchbox-panel-0.8.1/applets/mb-applet-battery.c matchbox-panel-0.8.1/applets/mb-applet-battery.c
+--- ../matchbox-panel-0.8.1-r4/matchbox-panel-0.8.1/applets/mb-applet-battery.c	2004-02-25 22:58:09.000000000 +0000
++++ matchbox-panel-0.8.1/applets/mb-applet-battery.c	2004-09-16 12:17:58.000000000 +0100
+@@ -385,8 +385,7 @@
+ 	sprintf(tray_msg, _("AC Connected\nFully charged.\n"));
+     } else {
+       if (apm_vals[PERCENTAGE] > 0 
+-	  && apm_vals[PERCENTAGE] < 100 
+-	  && apm_vals[TIME_LEFT] > 0)
++	  && apm_vals[PERCENTAGE] < 100)
+ 	{
+ 	  sprintf(tray_msg, 
+ 		  _("Battery Power\nJuice %.2i %%\nTime left: %.2i mins\n"), apm_vals[PERCENTAGE], apm_vals[TIME_LEFT]);
diff --git a/packages/matchbox-panel/matchbox-panel-0.8.1/more-automake-lossage.patch b/packages/matchbox-panel/matchbox-panel-0.8.1/more-automake-lossage.patch
index e69de29bb2..48959e0bf4 100644
--- a/packages/matchbox-panel/matchbox-panel-0.8.1/more-automake-lossage.patch
+++ b/packages/matchbox-panel/matchbox-panel-0.8.1/more-automake-lossage.patch
@@ -0,0 +1,10 @@
+--- matchbox-panel-0.8.1/applets/Makefile.am.old	2004-07-03 11:37:03.000000000 +0100
++++ matchbox-panel-0.8.1/applets/Makefile.am	2004-07-03 11:37:07.000000000 +0100
+@@ -13,7 +13,6 @@
+   mb-applet-clock    mb-applet-menu-launcher  mb-applet-wireless  \
+   mb-applet-launcher mb-applet-system-monitor mb-applet-battery
+ mb_applet_battery_SOURCES =        mb-applet-battery.c
+-mb_applet_battery_OBJECTS =        mb-applet-battery.$(OBJEXT)
+ mb_applet_battery_LDADD   =        $(LIBMB_LIBS) $(SN_LIBS) -lapm  
+ mb-applet-battery$(EXEEXT): $(mb_applet_battery_OBJECTS) 
+ 	@rm -f mb-applet-battery$(EXEEXT)
diff --git a/packages/matchbox-panel/matchbox-panel-0.8.3/.mtn2git_empty b/packages/matchbox-panel/matchbox-panel-0.8.3/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/matchbox-panel/matchbox-panel-0.8.3/.mtn2git_empty
diff --git a/packages/matchbox-panel/matchbox-panel-0.8.3/make-batteryapp-less-strict.patch b/packages/matchbox-panel/matchbox-panel-0.8.3/make-batteryapp-less-strict.patch
index e69de29bb2..45bff32b9a 100644
--- a/packages/matchbox-panel/matchbox-panel-0.8.3/make-batteryapp-less-strict.patch
+++ b/packages/matchbox-panel/matchbox-panel-0.8.3/make-batteryapp-less-strict.patch
@@ -0,0 +1,13 @@
+diff -urNd ../matchbox-panel-0.8.1-r4/matchbox-panel-0.8.1/applets/mb-applet-battery.c matchbox-panel-0.8.1/applets/mb-applet-battery.c
+--- ../matchbox-panel-0.8.1-r4/matchbox-panel-0.8.1/applets/mb-applet-battery.c	2004-02-25 22:58:09.000000000 +0000
++++ matchbox-panel-0.8.1/applets/mb-applet-battery.c	2004-09-16 12:17:58.000000000 +0100
+@@ -385,8 +385,7 @@
+ 	sprintf(tray_msg, _("AC Connected\nFully charged.\n"));
+     } else {
+       if (apm_vals[PERCENTAGE] > 0 
+-	  && apm_vals[PERCENTAGE] < 100 
+-	  && apm_vals[TIME_LEFT] > 0)
++	  && apm_vals[PERCENTAGE] < 100)
+ 	{
+ 	  sprintf(tray_msg, 
+ 		  _("Battery Power\nJuice %.2i %%\nTime left: %.2i mins\n"), apm_vals[PERCENTAGE], apm_vals[TIME_LEFT]);
diff --git a/packages/matchbox-panel/matchbox-panel-0.8.3/wifi-location.patch b/packages/matchbox-panel/matchbox-panel-0.8.3/wifi-location.patch
index e69de29bb2..930db66dc9 100644
--- a/packages/matchbox-panel/matchbox-panel-0.8.3/wifi-location.patch
+++ b/packages/matchbox-panel/matchbox-panel-0.8.3/wifi-location.patch
@@ -0,0 +1,54 @@
+--- matchbox-panel-0.8.1/src/panel.c	Mon Oct 25 00:15:53 2004
++++ matchbox-panel-0.8.1/src/panel.c	Tue Oct 26 21:40:56 2004
+@@ -813,6 +813,7 @@
+   int app_origin_dist = 0;
+   char *cmd_str = NULL;
+   MBPanelApp *new_papp = NULL;
++  Bool from_session = False;
+ 
+   util_get_command_str_from_win(panel, win, &cmd_str); /* cmd_str freed l8r */
+ 
+@@ -820,9 +821,10 @@
+     {
+       app_origin_dist = panel->session_init_offset;
+       session_preexisting_clear_current(panel);
++      from_session = True;
+     }
+ 
+-  new_papp = panel_app_new(panel, win, cmd_str);
++  new_papp = panel_app_new(panel, win, cmd_str, from_session);
+ 
+   if (new_papp) 
+     {
+--- matchbox-panel-0.8.1/src/panel_app.c	Mon Oct 25 00:15:53 2004
++++ matchbox-panel-0.8.1/src/panel_app.c	Tue Oct 26 21:39:28 2004
+@@ -239,7 +239,7 @@
+ }
+ 
+ MBPanelApp *
+-panel_app_new(MBPanel *panel, Window win, char *cmd_str)
++panel_app_new(MBPanel *panel, Window win, char *cmd_str, Bool from_session)
+ {
+   MBPanelApp        *papp;
+   XWindowAttributes  attr;
+@@ -261,7 +261,7 @@
+   papp->w = attr.width;
+   papp->h = attr.height;
+ 
+-  if (session_preexisting_restarting(panel) && !panel->session_run_first_time)
++  if (session_preexisting_restarting(panel) && !panel->session_run_first_time && from_session)
+     {
+       if (panel->session_cur_gravity == PAPP_GRAVITY_START)
+ 	add_at_start = True;
+--- matchbox-panel-0.8.1/src/panel_app.h	Tue Feb  3 15:11:25 2004
++++ matchbox-panel-0.8.1/src/panel_app.h	Tue Oct 26 21:42:07 2004
+@@ -61,7 +61,8 @@
+ 
+ MBPanelApp* panel_app_new(MBPanel *panel, 
+ 			  Window   win, 
+-			  char    *cmd );
++			  char    *cmd,
++			  Bool     from_session);
+ 
+ void panel_app_handle_configure_request(MBPanel *panel, 
+ 					XConfigureRequestEvent *ev);
diff --git a/packages/matchbox-panel/matchbox-panel-0.9.1/.mtn2git_empty b/packages/matchbox-panel/matchbox-panel-0.9.1/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/matchbox-panel/matchbox-panel-0.9.1/.mtn2git_empty
diff --git a/packages/matchbox-panel/matchbox-panel-0.9.1/allow-100-per-cent-battery.patch b/packages/matchbox-panel/matchbox-panel-0.9.1/allow-100-per-cent-battery.patch
index e69de29bb2..f66763f8cf 100644
--- a/packages/matchbox-panel/matchbox-panel-0.9.1/allow-100-per-cent-battery.patch
+++ b/packages/matchbox-panel/matchbox-panel-0.9.1/allow-100-per-cent-battery.patch
@@ -0,0 +1,30 @@
+Index: matchbox-panel-0.9.1/applets/mb-applet-battery.c
+===================================================================
+--- matchbox-panel-0.9.1.orig/applets/mb-applet-battery.c	2005-01-21 15:28:14.000000000 +0000
++++ matchbox-panel-0.9.1/applets/mb-applet-battery.c	2005-02-16 14:26:03.000000000 +0000
+@@ -230,7 +230,7 @@
+   printf("bar: %ix%i +%i+%i (%i)\n", bar_width, bar_height, bar_x, bar_y, mb_pixbuf_img_get_width(img_backing) );
+   */  
+ 
+-  if (apm_vals[PERCENTAGE] <= 0 || apm_vals[PERCENTAGE] > 99)
++  if (apm_vals[PERCENTAGE] <= 0 || apm_vals[PERCENTAGE] > 100)
+     { 
+       r = 0x66; g = 0xff; b = 0x33; ac_power = True; 
+       apm_vals[PERCENTAGE] = -1;
+@@ -378,14 +378,14 @@
+   if (apm_vals[AC_POWER] == AC_LINE_STATUS_ON)
+     {
+       if (apm_vals[PERCENTAGE] > 0 
+-	  && apm_vals[PERCENTAGE] < 100 )
++	  && apm_vals[PERCENTAGE] <= 100 )
+ 	sprintf(tray_msg, _("AC Connected\nCharging: %.2i %%\n")
+ 		, apm_vals[PERCENTAGE]);
+       else
+ 	sprintf(tray_msg, _("AC Connected\nFully charged.\n"));
+     } else {
+       if (apm_vals[PERCENTAGE] > 0 
+-	  && apm_vals[PERCENTAGE] < 100 
++	  && apm_vals[PERCENTAGE] <= 100 
+ 	  /* && apm_vals[TIME_LEFT] > 0 Less strict */)
+ 	{
+ 	  sprintf(tray_msg, 
diff --git a/packages/matchbox-panel/matchbox-panel-0.9.1/no_time_support.patch b/packages/matchbox-panel/matchbox-panel-0.9.1/no_time_support.patch
index e69de29bb2..d97afabf5b 100644
--- a/packages/matchbox-panel/matchbox-panel-0.9.1/no_time_support.patch
+++ b/packages/matchbox-panel/matchbox-panel-0.9.1/no_time_support.patch
@@ -0,0 +1,77 @@
+Index: matchbox-panel-0.9.1/applets/mb-applet-battery.c
+===================================================================
+--- matchbox-panel-0.9.1.orig/applets/mb-applet-battery.c	2005-02-16 14:29:16.000000000 +0000
++++ matchbox-panel-0.9.1/applets/mb-applet-battery.c	2005-02-16 16:45:55.000000000 +0000
+@@ -273,24 +273,28 @@
+ 	  mb_pixbuf_img_plot_pixel(pb, img_backing, x, y, r, g, b);
+     }
+ 
+-  /* Bubble alerts  */
+-  if ((time_left_idx > 0) 
+-      && !ac_power
+-      && apm_vals[PERCENTAGE] > 0
+-      /* && apm_vals[TIME_LEFT]  > 0 XXX Less strict */ 
+-      && (apm_vals[TIME_LEFT] < time_left_alerts[time_left_idx]))
++  /*dont do this if time values arent supported by this bios*/
++  if (apm_vals[TIME_LEFT] > 0 )
+     {
+-      char tray_msg[256];
+-      sprintf(tray_msg, 
+-	      _("Battery power very low !\n\nTime Left: %.2i minutes"), 
+-	      time_left_alerts[time_left_idx]);
+-      mb_tray_app_tray_send_message(app, tray_msg, 0);
+-      time_left_idx--;
+-    }
+-  else if (time_left_idx < 4 
+-	   && apm_vals[TIME_LEFT] > time_left_alerts[time_left_idx+1])
+-    {
+-      time_left_idx++;
++    /* Bubble alerts  */
++    if ((time_left_idx > 0) 
++        && !ac_power
++       && apm_vals[PERCENTAGE] > 0
++        /* && apm_vals[TIME_LEFT]  > 0 XXX Less strict */ 
++        && (apm_vals[TIME_LEFT] < time_left_alerts[time_left_idx]))
++      {
++        char tray_msg[256];
++        sprintf(tray_msg, 
++   	        _("Battery power very low !\n\nTime Left: %.2i minutes"), 
++	        time_left_alerts[time_left_idx]);
++        mb_tray_app_tray_send_message(app, tray_msg, 0);
++        time_left_idx--;
++      }
++    else if (time_left_idx < 4 
++  	     && apm_vals[TIME_LEFT] > time_left_alerts[time_left_idx+1])
++      {
++        time_left_idx++;
++      }
+     }
+ 
+   mb_pixbuf_img_render_to_drawable(pb, img_backing, drw, 0, 0);
+@@ -385,12 +389,20 @@
+ 	sprintf(tray_msg, _("AC Connected\nFully charged.\n"));
+     } else {
+       if (apm_vals[PERCENTAGE] > 0 
+-	  && apm_vals[PERCENTAGE] <= 100 
+-	  /* && apm_vals[TIME_LEFT] > 0 Less strict */)
+-	{
+-	  sprintf(tray_msg, 
+-		  _("Battery Power\nJuice %.2i %%\nTime left: %.2i mins\n"), apm_vals[PERCENTAGE], apm_vals[TIME_LEFT]);
+-	}
++	  && apm_vals[PERCENTAGE] <= 100 )
++        {
++	  if (apm_vals[TIME_LEFT] > 0 )
++	    {
++	      sprintf(tray_msg, 
++	   	      _("Battery Power\nJuice %.2i %%\nTime left: %.2i mins\n"), apm_vals[PERCENTAGE], apm_vals[TIME_LEFT]);
++	    }
++          else
++	    {
++	      sprintf(tray_msg, 
++	   	      _("Battery Power\nJuice %.2i %%\n"), apm_vals[PERCENTAGE]);
++	    }
++
++        }
+       else sprintf(tray_msg, _("Battery Power\n Device read error.\n"));
+     }
+   mb_tray_app_tray_send_message(app, tray_msg, 5000);
diff --git a/packages/matchbox-panel/matchbox-panel_0.8.1.bb b/packages/matchbox-panel/matchbox-panel_0.8.1.bb
index e69de29bb2..5844cad1f1 100644
--- a/packages/matchbox-panel/matchbox-panel_0.8.1.bb
+++ b/packages/matchbox-panel/matchbox-panel_0.8.1.bb
@@ -0,0 +1,19 @@
+SECTION = "x11/utils"
+PR = "r4"
+DESCRIPTION = "Matchbox panel"
+LICENSE = "GPL"
+DEPENDS = "libmatchbox x11 xext xpm apmd startup-notification virtual/kernel"
+
+SRC_URI = "ftp://ftp.handhelds.org/matchbox/sources/matchbox-panel/0.8/matchbox-panel-${PV}.tar.bz2 \
+	file://automake-lossage.patch;patch=1 \
+	file://more-automake-lossage.patch;patch=1 \
+	file://make-batteryapp-less-strict.patch;patch=1"
+S = "${WORKDIR}/matchbox-panel-${PV}"
+
+inherit autotools pkgconfig gettext
+
+EXTRA_OECONF = "--enable-startup-notification --enable-dnotify --enable-small-icons"
+
+FILES_${PN} = "${bindir} \
+	       ${datadir}/applications \
+	       ${datadir}/pixmaps"
diff --git a/packages/matchbox-panel/matchbox-panel_0.8.bb b/packages/matchbox-panel/matchbox-panel_0.8.bb
index e69de29bb2..fd31832b39 100644
--- a/packages/matchbox-panel/matchbox-panel_0.8.bb
+++ b/packages/matchbox-panel/matchbox-panel_0.8.bb
@@ -0,0 +1,14 @@
+SECTION = "x11/utils"
+DESCRIPTION = "Matchbox panel"
+LICENSE = "GPL"
+DEPENDS = "libmatchbox x11 xext xpm"
+RDEPENDS = "libmatchbox matchbox-common"
+
+SRC_URI = "ftp://ftp.handhelds.org/matchbox/sources/matchbox-panel/${PV}/matchbox-panel-${PV}.tar.bz2"
+S = "${WORKDIR}/matchbox-panel-${PV}"
+
+inherit autotools pkgconfig gettext
+
+EXTRA_OECONF = "--enable-small-icons"
+#		--enable-dnotify
+#		--enable-startup-notification
diff --git a/packages/matchbox-panel/matchbox-panel_0.9.bb b/packages/matchbox-panel/matchbox-panel_0.9.bb
index e69de29bb2..c54af97626 100644
--- a/packages/matchbox-panel/matchbox-panel_0.9.bb
+++ b/packages/matchbox-panel/matchbox-panel_0.9.bb
@@ -0,0 +1,15 @@
+DESCRIPTION = "Matchbox Window Manager Panel"
+LICENSE = "GPL"
+DEPENDS = "libmatchbox x11 xext xpm apmd startup-notification virtual/kernel"
+SECTION = "x11/wm"
+
+SRC_URI = "http://projects.o-hand.com/matchbox/sources/${PN}/${PV}/${PN}-${PV}.tar.gz"
+
+inherit autotools pkgconfig gettext
+
+EXTRA_OECONF = "--enable-startup-notification --enable-dnotify --enable-small-icons"
+
+FILES_${PN} = "${bindir} \
+	       ${datadir}/applications \
+	       ${datadir}/pixmaps"
+