author | Jon Tibble <meths@btinternet.com> |
Sat, 06 Oct 2012 16:11:50 +0100 | |
branch | s11express-2010-11 |
changeset 22109 | db10202d5f6d |
parent 17713 | 128cef95fb83 |
permissions | -rw-r--r-- |
16774
5314a7075ee9
* patches/gnome-panel-02-fish-applet.diff : Remove duplicate
mattman
parents:
16055
diff
changeset
|
1 |
/jds/bin/diff -uprN gnome-panel-2.28.0.old/configure.in gnome-panel-2.28.0/configure.in |
5314a7075ee9
* patches/gnome-panel-02-fish-applet.diff : Remove duplicate
mattman
parents:
16055
diff
changeset
|
2 |
--- gnome-panel-2.28.0.old/configure.in 2009-09-21 17:35:48.000000000 +0100 |
5314a7075ee9
* patches/gnome-panel-02-fish-applet.diff : Remove duplicate
mattman
parents:
16055
diff
changeset
|
3 |
+++ gnome-panel-2.28.0/configure.in 2009-10-15 15:52:34.875708828 +0100 |
5314a7075ee9
* patches/gnome-panel-02-fish-applet.diff : Remove duplicate
mattman
parents:
16055
diff
changeset
|
4 |
@@ -174,7 +174,7 @@ PANEL_INPROCESS_ALL= |
13284
90971fd56c17
* patches/gnome-panel-07-restrict-app-launching.diff : Fix Bug:6740246,
mattman
parents:
12066
diff
changeset
|
5 |
PANEL_INPROCESS_APPLETS= |
90971fd56c17
* patches/gnome-panel-07-restrict-app-launching.diff : Fix Bug:6740246,
mattman
parents:
12066
diff
changeset
|
6 |
AC_ARG_WITH(in-process-applets, |
90971fd56c17
* patches/gnome-panel-07-restrict-app-launching.diff : Fix Bug:6740246,
mattman
parents:
12066
diff
changeset
|
7 |
AC_HELP_STRING([--with-in-process-applets=APPLETS], |
90971fd56c17
* patches/gnome-panel-07-restrict-app-launching.diff : Fix Bug:6740246,
mattman
parents:
12066
diff
changeset
|
8 |
- [comma-separated list of applets to compile in-process (possible values: none, clock, fish, notification-area, wncklet, all) @<:@default=none@:>@]), |
90971fd56c17
* patches/gnome-panel-07-restrict-app-launching.diff : Fix Bug:6740246,
mattman
parents:
12066
diff
changeset
|
9 |
+ [comma-separated list of applets to compile in-process (possible values: none, clock, notification-area, wncklet, all) @<:@default=none@:>@]), |
90971fd56c17
* patches/gnome-panel-07-restrict-app-launching.diff : Fix Bug:6740246,
mattman
parents:
12066
diff
changeset
|
10 |
[for i in `echo $withval | tr , ' '`; do |
90971fd56c17
* patches/gnome-panel-07-restrict-app-launching.diff : Fix Bug:6740246,
mattman
parents:
12066
diff
changeset
|
11 |
if test $i = "none"; then |
90971fd56c17
* patches/gnome-panel-07-restrict-app-launching.diff : Fix Bug:6740246,
mattman
parents:
12066
diff
changeset
|
12 |
PANEL_INPROCESS_NONE=1 |
16774
5314a7075ee9
* patches/gnome-panel-02-fish-applet.diff : Remove duplicate
mattman
parents:
16055
diff
changeset
|
13 |
@@ -182,20 +182,18 @@ AC_ARG_WITH(in-process-applets, |
13284
90971fd56c17
* patches/gnome-panel-07-restrict-app-launching.diff : Fix Bug:6740246,
mattman
parents:
12066
diff
changeset
|
14 |
PANEL_INPROCESS_ALL=1 |
90971fd56c17
* patches/gnome-panel-07-restrict-app-launching.diff : Fix Bug:6740246,
mattman
parents:
12066
diff
changeset
|
15 |
else if test $i = "clock"; then |
90971fd56c17
* patches/gnome-panel-07-restrict-app-launching.diff : Fix Bug:6740246,
mattman
parents:
12066
diff
changeset
|
16 |
PANEL_INPROCESS_APPLETS="$PANEL_INPROCESS_APPLETS $i" |
90971fd56c17
* patches/gnome-panel-07-restrict-app-launching.diff : Fix Bug:6740246,
mattman
parents:
12066
diff
changeset
|
17 |
- else if test $i = "fish"; then |
90971fd56c17
* patches/gnome-panel-07-restrict-app-launching.diff : Fix Bug:6740246,
mattman
parents:
12066
diff
changeset
|
18 |
- PANEL_INPROCESS_APPLETS="$PANEL_INPROCESS_APPLETS $i" |
90971fd56c17
* patches/gnome-panel-07-restrict-app-launching.diff : Fix Bug:6740246,
mattman
parents:
12066
diff
changeset
|
19 |
else if test $i = "notification-area"; then |
90971fd56c17
* patches/gnome-panel-07-restrict-app-launching.diff : Fix Bug:6740246,
mattman
parents:
12066
diff
changeset
|
20 |
PANEL_INPROCESS_APPLETS="$PANEL_INPROCESS_APPLETS $i" |
90971fd56c17
* patches/gnome-panel-07-restrict-app-launching.diff : Fix Bug:6740246,
mattman
parents:
12066
diff
changeset
|
21 |
else if test $i = "wncklet"; then |
90971fd56c17
* patches/gnome-panel-07-restrict-app-launching.diff : Fix Bug:6740246,
mattman
parents:
12066
diff
changeset
|
22 |
PANEL_INPROCESS_APPLETS="$PANEL_INPROCESS_APPLETS $i" |
90971fd56c17
* patches/gnome-panel-07-restrict-app-launching.diff : Fix Bug:6740246,
mattman
parents:
12066
diff
changeset
|
23 |
else |
90971fd56c17
* patches/gnome-panel-07-restrict-app-launching.diff : Fix Bug:6740246,
mattman
parents:
12066
diff
changeset
|
24 |
echo "applet $i not recognized, ignoring..." |
90971fd56c17
* patches/gnome-panel-07-restrict-app-launching.diff : Fix Bug:6740246,
mattman
parents:
12066
diff
changeset
|
25 |
- fi; fi; fi; fi; fi; fi |
90971fd56c17
* patches/gnome-panel-07-restrict-app-launching.diff : Fix Bug:6740246,
mattman
parents:
12066
diff
changeset
|
26 |
+ fi; fi; fi; fi; fi |
90971fd56c17
* patches/gnome-panel-07-restrict-app-launching.diff : Fix Bug:6740246,
mattman
parents:
12066
diff
changeset
|
27 |
done], |
90971fd56c17
* patches/gnome-panel-07-restrict-app-launching.diff : Fix Bug:6740246,
mattman
parents:
12066
diff
changeset
|
28 |
[]) |
90971fd56c17
* patches/gnome-panel-07-restrict-app-launching.diff : Fix Bug:6740246,
mattman
parents:
12066
diff
changeset
|
29 |
|
90971fd56c17
* patches/gnome-panel-07-restrict-app-launching.diff : Fix Bug:6740246,
mattman
parents:
12066
diff
changeset
|
30 |
if test -n "$PANEL_INPROCESS_ALL"; then |
90971fd56c17
* patches/gnome-panel-07-restrict-app-launching.diff : Fix Bug:6740246,
mattman
parents:
12066
diff
changeset
|
31 |
- PANEL_INPROCESS_APPLETS="clock fish notification-area wncklet" |
90971fd56c17
* patches/gnome-panel-07-restrict-app-launching.diff : Fix Bug:6740246,
mattman
parents:
12066
diff
changeset
|
32 |
+ PANEL_INPROCESS_APPLETS="clock notification-area wncklet" |
90971fd56c17
* patches/gnome-panel-07-restrict-app-launching.diff : Fix Bug:6740246,
mattman
parents:
12066
diff
changeset
|
33 |
fi |
90971fd56c17
* patches/gnome-panel-07-restrict-app-launching.diff : Fix Bug:6740246,
mattman
parents:
12066
diff
changeset
|
34 |
if test -n "$PANEL_INPROCESS_NONE"; then |
90971fd56c17
* patches/gnome-panel-07-restrict-app-launching.diff : Fix Bug:6740246,
mattman
parents:
12066
diff
changeset
|
35 |
PANEL_INPROCESS_APPLETS="" |
16774
5314a7075ee9
* patches/gnome-panel-02-fish-applet.diff : Remove duplicate
mattman
parents:
16055
diff
changeset
|
36 |
@@ -205,10 +203,6 @@ for i in $PANEL_INPROCESS_APPLETS; do |
13284
90971fd56c17
* patches/gnome-panel-07-restrict-app-launching.diff : Fix Bug:6740246,
mattman
parents:
12066
diff
changeset
|
37 |
CLOCK_COMPILE_INPROCESS=1 |
90971fd56c17
* patches/gnome-panel-07-restrict-app-launching.diff : Fix Bug:6740246,
mattman
parents:
12066
diff
changeset
|
38 |
AC_DEFINE([CLOCK_INPROCESS], 1, |
90971fd56c17
* patches/gnome-panel-07-restrict-app-launching.diff : Fix Bug:6740246,
mattman
parents:
12066
diff
changeset
|
39 |
[Defined when compiling the clock applet in-process]) |
90971fd56c17
* patches/gnome-panel-07-restrict-app-launching.diff : Fix Bug:6740246,
mattman
parents:
12066
diff
changeset
|
40 |
- else if test $i = "fish"; then |
90971fd56c17
* patches/gnome-panel-07-restrict-app-launching.diff : Fix Bug:6740246,
mattman
parents:
12066
diff
changeset
|
41 |
- FISH_COMPILE_INPROCESS=1 |
90971fd56c17
* patches/gnome-panel-07-restrict-app-launching.diff : Fix Bug:6740246,
mattman
parents:
12066
diff
changeset
|
42 |
- AC_DEFINE([FISH_INPROCESS], 1, |
90971fd56c17
* patches/gnome-panel-07-restrict-app-launching.diff : Fix Bug:6740246,
mattman
parents:
12066
diff
changeset
|
43 |
- [Defined when compiling the fish applet in-process]) |
90971fd56c17
* patches/gnome-panel-07-restrict-app-launching.diff : Fix Bug:6740246,
mattman
parents:
12066
diff
changeset
|
44 |
else if test $i = "notification-area"; then |
90971fd56c17
* patches/gnome-panel-07-restrict-app-launching.diff : Fix Bug:6740246,
mattman
parents:
12066
diff
changeset
|
45 |
NOTIFICATION_AREA_COMPILE_INPROCESS=1 |
90971fd56c17
* patches/gnome-panel-07-restrict-app-launching.diff : Fix Bug:6740246,
mattman
parents:
12066
diff
changeset
|
46 |
AC_DEFINE([NOTIFICATION_AREA_INPROCESS], 1, |
16774
5314a7075ee9
* patches/gnome-panel-02-fish-applet.diff : Remove duplicate
mattman
parents:
16055
diff
changeset
|
47 |
@@ -332,7 +326,6 @@ po/Makefile.in |
12066 | 48 |
applets/Makefile |
8382
5340d1f7700f
Remove gnome-panel-02-workspace-switcher.diff : #127285, applied upstream.
mattman
parents:
diff
changeset
|
49 |
applets/clock/Makefile |
11456 | 50 |
applets/clock/pixmaps/Makefile |
8382
5340d1f7700f
Remove gnome-panel-02-workspace-switcher.diff : #127285, applied upstream.
mattman
parents:
diff
changeset
|
51 |
-applets/fish/Makefile |
5340d1f7700f
Remove gnome-panel-02-workspace-switcher.diff : #127285, applied upstream.
mattman
parents:
diff
changeset
|
52 |
applets/notification_area/Makefile |
5340d1f7700f
Remove gnome-panel-02-workspace-switcher.diff : #127285, applied upstream.
mattman
parents:
diff
changeset
|
53 |
applets/wncklet/Makefile |
5340d1f7700f
Remove gnome-panel-02-workspace-switcher.diff : #127285, applied upstream.
mattman
parents:
diff
changeset
|
54 |
doc/Makefile |
16774
5314a7075ee9
* patches/gnome-panel-02-fish-applet.diff : Remove duplicate
mattman
parents:
16055
diff
changeset
|
55 |
@@ -340,7 +333,6 @@ doc/reference/Makefile |
5314a7075ee9
* patches/gnome-panel-02-fish-applet.diff : Remove duplicate
mattman
parents:
16055
diff
changeset
|
56 |
doc/reference/panel-applet/Makefile |
5314a7075ee9
* patches/gnome-panel-02-fish-applet.diff : Remove duplicate
mattman
parents:
16055
diff
changeset
|
57 |
help/Makefile |
5314a7075ee9
* patches/gnome-panel-02-fish-applet.diff : Remove duplicate
mattman
parents:
16055
diff
changeset
|
58 |
help/clock/Makefile |
5314a7075ee9
* patches/gnome-panel-02-fish-applet.diff : Remove duplicate
mattman
parents:
16055
diff
changeset
|
59 |
-help/fish/Makefile |
5314a7075ee9
* patches/gnome-panel-02-fish-applet.diff : Remove duplicate
mattman
parents:
16055
diff
changeset
|
60 |
man/Makefile |
5314a7075ee9
* patches/gnome-panel-02-fish-applet.diff : Remove duplicate
mattman
parents:
16055
diff
changeset
|
61 |
]) |
5314a7075ee9
* patches/gnome-panel-02-fish-applet.diff : Remove duplicate
mattman
parents:
16055
diff
changeset
|
62 |
|
5314a7075ee9
* patches/gnome-panel-02-fish-applet.diff : Remove duplicate
mattman
parents:
16055
diff
changeset
|
63 |
/jds/bin/diff -uprN gnome-panel-2.28.0.old/applets/Makefile.am gnome-panel-2.28.0/applets/Makefile.am |
5314a7075ee9
* patches/gnome-panel-02-fish-applet.diff : Remove duplicate
mattman
parents:
16055
diff
changeset
|
64 |
--- gnome-panel-2.28.0.old/applets/Makefile.am 2009-05-02 02:01:58.000000000 +0100 |
5314a7075ee9
* patches/gnome-panel-02-fish-applet.diff : Remove duplicate
mattman
parents:
16055
diff
changeset
|
65 |
+++ gnome-panel-2.28.0/applets/Makefile.am 2009-10-15 15:52:34.875323844 +0100 |
15852
a8250f4dc27e
* SUNWgnome-panel.spec : Bump gnome-panel to 2.26.2
mattman
parents:
14907
diff
changeset
|
66 |
@@ -1,6 +1,5 @@ |
a8250f4dc27e
* SUNWgnome-panel.spec : Bump gnome-panel to 2.26.2
mattman
parents:
14907
diff
changeset
|
67 |
SUBDIRS = \ |
a8250f4dc27e
* SUNWgnome-panel.spec : Bump gnome-panel to 2.26.2
mattman
parents:
14907
diff
changeset
|
68 |
clock \ |
a8250f4dc27e
* SUNWgnome-panel.spec : Bump gnome-panel to 2.26.2
mattman
parents:
14907
diff
changeset
|
69 |
- fish \ |
a8250f4dc27e
* SUNWgnome-panel.spec : Bump gnome-panel to 2.26.2
mattman
parents:
14907
diff
changeset
|
70 |
notification_area \ |
a8250f4dc27e
* SUNWgnome-panel.spec : Bump gnome-panel to 2.26.2
mattman
parents:
14907
diff
changeset
|
71 |
wncklet |
a8250f4dc27e
* SUNWgnome-panel.spec : Bump gnome-panel to 2.26.2
mattman
parents:
14907
diff
changeset
|
72 |
|
16774
5314a7075ee9
* patches/gnome-panel-02-fish-applet.diff : Remove duplicate
mattman
parents:
16055
diff
changeset
|
73 |
/jds/bin/diff -uprN gnome-panel-2.28.0.old/help/Makefile.am gnome-panel-2.28.0/help/Makefile.am |
5314a7075ee9
* patches/gnome-panel-02-fish-applet.diff : Remove duplicate
mattman
parents:
16055
diff
changeset
|
74 |
--- gnome-panel-2.28.0.old/help/Makefile.am 2009-07-01 14:06:23.000000000 +0100 |
5314a7075ee9
* patches/gnome-panel-02-fish-applet.diff : Remove duplicate
mattman
parents:
16055
diff
changeset
|
75 |
+++ gnome-panel-2.28.0/help/Makefile.am 2009-10-15 15:52:34.875929591 +0100 |
15852
a8250f4dc27e
* SUNWgnome-panel.spec : Bump gnome-panel to 2.26.2
mattman
parents:
14907
diff
changeset
|
76 |
@@ -1,3 +1,3 @@ |
16055 | 77 |
-SUBDIRS = clock fish |
78 |
+SUBDIRS = clock |
|
15852
a8250f4dc27e
* SUNWgnome-panel.spec : Bump gnome-panel to 2.26.2
mattman
parents:
14907
diff
changeset
|
79 |
|
a8250f4dc27e
* SUNWgnome-panel.spec : Bump gnome-panel to 2.26.2
mattman
parents:
14907
diff
changeset
|
80 |
-include $(top_srcdir)/git.mk |
17713 | 81 |
diff -ruN gnome-panel-2.29.92.1.orig/configure.in gnome-panel-2.29.92.1/configure.in |
82 |
--- gnome-panel-2.29.92.1.orig/configure.in 2010-03-15 03:26:34.022622316 +0000 |
|
83 |
+++ gnome-panel-2.29.92.1/configure.in 2010-03-15 03:27:00.996859771 +0000 |
|
84 |
@@ -213,7 +213,7 @@ |
|
85 |
WNCKLET_COMPILE_INPROCESS=1 |
|
86 |
AC_DEFINE([WNCKLET_INPROCESS], 1, |
|
87 |
[Defined when compiling the wncklet applet in-process]) |
|
88 |
- fi; fi; fi; fi |
|
89 |
+ fi; fi; fi |
|
90 |
done |
|
91 |
if test "x$PANEL_INPROCESS_APPLETS" = "x"; then |
|
92 |
PANEL_INPROCESS_APPLETS="(none)" |