diff options
| author | Chris Larson <clarson@kergoth.com> | 2004-11-09 00:36:47 +0000 |
|---|---|---|
| committer | Chris Larson <clarson@kergoth.com> | 2004-11-09 00:36:47 +0000 |
| commit | f96441b9faf769c9ecdd4d338b605ea3d0cc4010 (patch) | |
| tree | edb17ec2c4ea13c5acb1c7350957a249a820e28d /matchbox-panel | |
| parent | b6588aa6851fb220cedc387d21c51513ef8d67f4 (diff) | |
Disable bk EOLN_NATIVE conversions on all files in packages FILESPATHs, to prevent it screwing up patches.
BKrev: 4190111fA4MuVozAqwE7xOSL9fr-TA
Diffstat (limited to 'matchbox-panel')
4 files changed, 56 insertions, 0 deletions
diff --git a/matchbox-panel/matchbox-panel-0.8.1/automake-lossage.patch b/matchbox-panel/matchbox-panel-0.8.1/automake-lossage.patch index e69de29bb2..b8a8613779 100644 --- a/matchbox-panel/matchbox-panel-0.8.1/automake-lossage.patch +++ b/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/matchbox-panel/matchbox-panel-0.8.1/make-batteryapp-less-strict.patch b/matchbox-panel/matchbox-panel-0.8.1/make-batteryapp-less-strict.patch index e69de29bb2..45bff32b9a 100644 --- a/matchbox-panel/matchbox-panel-0.8.1/make-batteryapp-less-strict.patch +++ b/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/matchbox-panel/matchbox-panel-0.8.1/more-automake-lossage.patch b/matchbox-panel/matchbox-panel-0.8.1/more-automake-lossage.patch index e69de29bb2..48959e0bf4 100644 --- a/matchbox-panel/matchbox-panel-0.8.1/more-automake-lossage.patch +++ b/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/matchbox-panel/matchbox-panel-0.8.3/make-batteryapp-less-strict.patch b/matchbox-panel/matchbox-panel-0.8.3/make-batteryapp-less-strict.patch index e69de29bb2..45bff32b9a 100644 --- a/matchbox-panel/matchbox-panel-0.8.3/make-batteryapp-less-strict.patch +++ b/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]); |