/[gentoo-x86]/dev-java/java-gnome/files/java-gnome-4.0.19-libnotify-0.7.patch
Gentoo

Contents of /dev-java/java-gnome/files/java-gnome-4.0.19-libnotify-0.7.patch

Parent Directory Parent Directory | Revision Log Revision Log


Revision 1.3 - (hide annotations) (download)
Mon Mar 28 16:15:51 2011 UTC (4 years, 4 months ago) by serkan
Branch: MAIN
CVS Tags: HEAD
Changes since 1.2: +77 -54 lines
Fix javadoc failure with libnotify-0.7 reported in bug #360837.

(Portage version: 2.2.0_alpha28/cvs/Linux x86_64)

1 serkan 1.1 # Bazaar merge directive format 2 (Bazaar 0.90)
2 serkan 1.3 # revision_id: serkan@gentoo.org-20110328160500-s98m2vzg7wh44xsx
3 serkan 1.1 # target_branch: ../mainline
4 serkan 1.3 # testament_sha1: 3cf7a2a7e1af3fab89b8ead7f906642d84977eb2
5     # timestamp: 2011-03-28 19:11:05 +0300
6 serkan 1.2 # source_branch: /usr/portage/dev-java/java-gnome/files/java-gnome-\
7     # 4.0.19-libnotify-0.7.patch
8 serkan 1.1 # base_revision_id: andrew@operationaldynamics.com-20110214064042-\
9     # fv6tgq41rru7wjng
10     #
11     # Begin patch
12     === modified file 'configure'
13     --- configure 2011-02-14 06:40:42 +0000
14     +++ configure 2011-02-14 22:27:29 +0000
15     @@ -805,7 +805,7 @@
16     "gtkspell");
17    
18     check_system_library(@gnomedev_libs,
19     - "libnotify >= 0.4.5 libnotify < 0.7.0",
20     + "libnotify >= 0.7.0",
21     "LibNotify",
22     "libnotify");
23    
24     @@ -853,7 +853,7 @@
25     "FIXME");
26    
27     check_system_library(@gnomedev_libs,
28     - "libnotify >= 0.4.5 libnotify < 0.7.0",
29     + "libnotify >= 0.7.0",
30     "LibNotify",
31     "FIXME");
32    
33     @@ -917,7 +917,7 @@
34     "libgtksourceview2.0-dev");
35    
36     check_system_library(@gnomedev_libs,
37     - "libnotify >= 0.4.5 libnotify < 0.7.0",
38     + "libnotify >= 0.7.0",
39     "LibNotify",
40     "libnotify-dev");
41    
42     @@ -968,7 +968,7 @@
43     "FIXME");
44    
45     check_system_library(@gnomedev_libs,
46     - "libnotify >= 0.4.5 libnotify < 0.7.0",
47     + "libnotify >= 0.7.0",
48     "LibNotify",
49     "FIXME");
50    
51     @@ -1020,7 +1020,7 @@
52     "lib${cpu_arch}gtksourceview-2.0-devel");
53    
54     check_system_library(@gnomedev_libs,
55     - "libnotify >= 0.4.5 libnotify < 0.7.0",
56     + "libnotify >= 0.7.0",
57     "LibNotify",
58     "lib${cpu_arch}notify-devel");
59    
60     @@ -1083,7 +1083,7 @@
61     "FIXME");
62    
63     check_system_library(@gnomedev_libs,
64     - "libnotify >= 0.4.5 libnotify < 0.7.0",
65     + "libnotify >= 0.7.0",
66     "LibNotify",
67     "FIXME");
68    
69    
70 serkan 1.3 === modified file 'doc/examples/notify/ExampleLowBattery.java'
71     --- doc/examples/notify/ExampleLowBattery.java 2010-01-06 06:54:34 +0000
72     +++ doc/examples/notify/ExampleLowBattery.java 2011-03-28 16:05:00 +0000
73     @@ -61,7 +61,7 @@
74     */
75    
76     notification = new Notification("Low Battery Example", "Your battery is low!",
77     - "messagebox_warning", icon);
78     + "messagebox_warning");
79    
80     /*
81     * Quit the application after notification disappears.
82    
83 serkan 1.1 === modified file 'src/bindings/org/gnome/notify/Notification.java'
84     --- src/bindings/org/gnome/notify/Notification.java 2011-02-14 03:34:07 +0000
85 serkan 1.2 +++ src/bindings/org/gnome/notify/Notification.java 2011-03-13 22:23:48 +0000
86     @@ -80,41 +80,7 @@
87     */
88    
89     public Notification(String summary, String body, String icon) {
90     - super(NotifyNotification.createNotification(summary, body, icon, null));
91     - }
92     -
93     - /**
94     - * Create a new notification.
95     - *
96     - * <p>
97     - * The summary appears on the titlebar of notification and body appears as
98     - * its text. Icon may be a string defining a theme icon or the filename
99 serkan 1.1 - * identifying the icon that appears next to text. Attach identifies the
100     - * widget that the notification relates to.
101 serkan 1.2 - *
102     - * <p>
103     - * Note that all but summary can be <code>null</code>.
104     - *
105     - * @since 4.0.12
106     - * @deprecated In GNOME 3, notifications will be independent of widgets and status icons.
107     - * See http://live.gnome.org/GnomeShell/Design/Guidelines/MessageTray/Compatibility
108     - */
109     -
110 serkan 1.1 - public Notification(String summary, String body, String icon, Widget attach) {
111     - super(NotifyNotification.createNotification(summary, body, icon, attach));
112     - }
113     -
114     - /**
115     - * Create a new notification attached to a {@link StatusIcon}. See
116     - * {@link #Notification(String,String,String,Widget) Notification()} for
117     - * other parameters.
118     - *
119     - * @since 4.0.12
120     - * @deprecated In GNOME 3, notifications will be independent of widgets and status icons.
121     - * See http://live.gnome.org/GnomeShell/Design/Guidelines/MessageTray/Compatibility
122     - */
123     - public Notification(String summary, String body, String icon, StatusIcon statusIcon) {
124     - super(NotifyNotification.createNotificationWithStatusIcon(summary, body, icon, statusIcon));
125     + super(NotifyNotification.createNotification(summary, body, icon));
126     }
127    
128     /**
129 serkan 1.2 @@ -131,39 +97,6 @@
130 serkan 1.1 }
131    
132     /**
133     - * Attaches Notification to a Widget setting hints to its location.
134     - *
135     - * @since 4.0.12
136     - * @deprecated In GNOME 3, notifications will be independent of widgets and status icons.
137     - * See http://live.gnome.org/GnomeShell/Design/Guidelines/MessageTray/Compatibility
138     - */
139     - public void attach(Widget attach) {
140     - NotifyNotification.attachToWidget(this, attach);
141     - }
142     -
143     - /**
144     - * Attaches Notification to a {@link StatusIcon} setting hints to its
145     - * location.
146     - *
147     - * @since 4.0.12
148     - * @deprecated In GNOME 3, notifications will be independent of widgets and status icons.
149     - * See http://live.gnome.org/GnomeShell/Design/Guidelines/MessageTray/Compatibility
150     - */
151     - public void attach(StatusIcon statusIcon) {
152     - NotifyNotification.attachToStatusIcon(this, statusIcon);
153     - }
154     -
155     - /**
156     - * Sets the position of the notification to display on screen.
157     - *
158     - * @since 4.0.12
159     - * @deprecated In GNOME 3
160     - */
161     - public void setGeometryHints(Screen screen, int x, int y) {
162     - NotifyNotification.setGeometryHints(this, screen, x, y);
163     - }
164     -
165     - /**
166     * Display the notification on screen.
167     *
168     * @since 4.0.12
169    
170     === modified file 'src/defs/NotifyNotification.defs'
171     --- src/defs/NotifyNotification.defs 2009-05-16 05:46:28 +0000
172     +++ src/defs/NotifyNotification.defs 2011-01-31 17:58:10 +0000
173     @@ -15,19 +15,6 @@
174     '("const-gchar*" "summary")
175     '("const-gchar*" "body" (null-ok))
176     '("const-gchar*" "icon" (null-ok))
177     - '("GtkWidget*" "attach" (null-ok))
178     - )
179     -)
180     -
181     -(define-function notify_notification_new_with_status_icon
182     - (is-constructor-of "NotifyNotification")
183     - (c-name "notify_notification_new_with_status_icon")
184     - (return-type "NotifyNotification*")
185     - (parameters
186     - '("const-gchar*" "summary")
187     - '("const-gchar*" "body" (null-ok))
188     - '("const-gchar*" "icon" (null-ok))
189     - '("GtkStatusIcon*" "status_icon")
190     )
191     )
192    
193     @@ -42,35 +29,6 @@
194     )
195     )
196    
197     -(define-method attach_to_widget
198     - (of-object "NotifyNotification")
199     - (c-name "notify_notification_attach_to_widget")
200     - (return-type "none")
201     - (parameters
202     - '("GtkWidget*" "attach")
203     - )
204     -)
205     -
206     -(define-method attach_to_status_icon
207     - (of-object "NotifyNotification")
208     - (c-name "notify_notification_attach_to_status_icon")
209     - (return-type "none")
210     - (parameters
211     - '("GtkStatusIcon*" "status_icon")
212     - )
213     -)
214     -
215     -(define-method set_geometry_hints
216     - (of-object "NotifyNotification")
217     - (c-name "notify_notification_set_geometry_hints")
218     - (return-type "none")
219     - (parameters
220     - '("GdkScreen*" "screen")
221     - '("gint" "x")
222     - '("gint" "y")
223     - )
224     -)
225     -
226     (define-method show
227     (of-object "NotifyNotification")
228     (c-name "notify_notification_show")
229    
230     # Begin bundle
231 serkan 1.3 IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWYC7DCIACghfgGQ0UH///3//
232     //C////4YA8dZ9xu46SdZbWaakqAoAZ9be83nuFDIehp7YKESiQZSepimaU9ED1D1Hih6TJtIAaA
233     0AANAeUCUQCYBNQRKf6o0hpk9T0npAYg2oAaaeoGgOMjTJiaDJkwmmQMhoDQGmTQwAmgMJESZECN
234     MTTKeqYw1TaTGp6mmTaTQNMj0mmmg0BJVE2jQjNCYmmENNP1Q09E2kejUwR6hoeoGEAkkEAEyA0N
235     BBkiehqZPIaamJPU9R6nqDQbU0lswJsE7CsC4hcgMGbOQ7q0NbmapCXrHz6wR2GWwpYUeWhigoZK
236     BRcS0pX8rt1mLkAhhrkgJHjh/X9W+eJa4a/04wbaiV+js0OQSE2bW61UKvY1WrBaqWUG320Xgm0E
237     JunEVhJjuCJAawksggoNlJAgD5AkleVaNLRjE3IUwT0jUdKX1RKD2ZyCGNg2mxttNo+PjFm96QfE
238     PlVWvZCgbGhwzVBw6Io4mdNM08TuKGO1C1CLykWutV30pWd19s76tZjvrM3Y3Rsmg5ImFjaKYoxs
239     vutN1YwawlEe6akoq98H8LJ39Q0J9yYdA8Byoe0BwfsBLwzpMiY52uaNQKItAfNsDI+53C/eoZCT
240     XHWhKKJFsCwKkZ4CWR5D5A/zY9GzoboKx0E3AuIbgh9uAzO4hn7Bja37+nJyreaJxdiSmJ6HgHsF
241     7XIR2huwc0wVuNuv0frjtiK0PABB8wXcCejRtG/5hvOgIBw5l6vE2bvnSYgYmkB8wgsusGLfzzkR
242     yAVhBIsSUgbQ7A2UgWg4FIDcoTzCpCEEoyOQrzKwisLaRyZhcxCVO9L2B+/q/9z6j7upeVVTAREK
243     IgiI58mzxW26qHO+TWGgSK4Qa6QkNihpYg9QmIJAtIUmLucKJODADAvLXo5WIKoOSgcXJCUkAE0c
244     QUFBJEGxCwcu1gp7Tc8pYFYkMBNRfqaKghu+4gA+VOuqHDE+m3iJFCM0FqYGmV5FZVEPO0xVnyKi
245     JCY5xnhET0E3GUo2iBshaqaRoUQuI1hUDpM84LXfJskD/JSWK/aK8NpdKFmzckQSC10iGaGs9IVG
246     EVvDh6QqILFmjrxiCWhDuY8Ye0oCKKp2Q6TkBsiGbckrZQSWNVlV4g1wpCoJwnRLSFiJk7P9HoUb
247     a3bHv5gArDViVbq2wgOQRYdQ5uZbxC4EldJjdACPkGgNeksqmVIgwMOUegDhwTRDjexSMhZ0ngQM
248     /MFOvFfU10bQ7N540/kHXCQB6UnW1vyIaR42p5dibchLIC4WIkK8mnJGYc+YpGki9jNBpyJMj+A8
249     dEQQyYQBgra7tlmmxCM6y2zZy61bgVUlIKQy57USV9prQFfteooEJRGYiDnObCeFMIvDYXWeiush
250     NoJ6GSU6py1WFIDD3UPVxPS5JP3tmiYvnBMCNvTn4pEppJL8hlIjh7SsHRU5HY+Tx7AO/gQL+YS4
251     rPajYGBjsPczp1ZIkatM0A10dVJJEQY1wkSRXgGubTOhWbZgGv03PlAZsuCcTJudx1yU2XhUzKYO
252     54GCZhc8UKPgHDwUeLYzL15zmZfV3c0HVd+AQPIPIPi9gdKR56BBbUSpzqdGRbGZjUSrRGASSIZE
253     DUzklqkdJEoT1fWhz0VuSUWZxmM+rRcUsOLZ5o0WkvrAdg+0jr1NOGPYPhIEuTbjgIOL69SJpUFU
254     GNZeBBIwhM9iunKRhBS2kNvXTWYrAbRLliGgt++AH2YxR5dnWsHOHgtGp1AcwiKiEWbowJoVIy5o
255     xo42acNRCHeJ2d3IbMmQbRTJc5aYMcbcNclZiBgdLg0C+65c3NX7sLXVBpu0JxbpeDv3hG2SCmGa
256     u9xYu38kKQBJjy6vRqF8R6mVyy0ewnkJNMFGD0KZ7H2BsvLlEJal082UObtucRaXH87ncpxGxxar
257     RowSxa3IdAT7PO3gPQYKnQUuLouKXG3UiT1LiECf/ofGhG8e9HNPR0YOS9YMczkkRjKQpPQC1SQS
258     Gmpirnj0l0V4DGaS19kw7K4KCB04Xr6SH7aT3xNq0Gf5q0cMB4eA8IgdHdsmnkclsyIyOhgXvw2j
259     6sz/BEPhAVCrg1bG91HqiqPtjQIpC+GI0YIGotAXnsUIvVX4ZU4HtoMMFsTC7jjsGg1RysjDIpJN
260     OBT4Pg1gcc69VbC7sSbzYwBvyC0On+P9U6miaCbk5L9zeDJrkwj/HcsYKgdgTpOelgQ6sGXb19cE
261     RLoekOhPoZESSsorGtapskaGlWPEiRLtgTJ1IzoRkQBm+Sg0tNvTQ6QkLDc8GBvzgQsqqFHcFZY6
262     AoIKH4Yci3JbJ3oTN/JhhPtuzzjLw+cIp4D4wZgL3CiBmjoIKCOGArQVHBUBYBoBiIUCEgYZrBFg
263     RVIvBF8gw+89SRxh2i84dxGMYxo4CCCFDQZ02NtuSwcy+CGyWLmCUISsOgqPhh1hrC7FTfyxbQck
264     BIf0AQhhDDvz+H87e40NpjTEuxwxjXy7QNnB5WHg9veuyo+n1+yQdAd7/p5/4H1AoV8v+h1cEwU5
265     A2H6g93kGTvpNVrtucEE51vOY/OIHrQOAboLaDQKhW6Qg6grkVNborAM4Au9FS5sM+DGIo3rgCvT
266     EqV3GA6nbxb8UQFUnHx3AV4AbwYMjBPZ+p5lxbL1e70FXeajnWCyeAWguzthmnxs1hn8vaBQHUfg
267     ds4BiGQAhiEQebNGQtUrBLAmuGPAENyiA5U5QeY8DQbwXMmANLMrGzOeIbBg+gGCPX66CXu9gZAq
268     MXnPP2bjjGW240l+Q0ifIZ9lvfi2mHXJXqtF0UedzgR6MlSeGOEsaqsV5M/lCfuCWqfe0coa/oHc
269     QPM9nxfoO++/3ch+cEF+V3AF7WSqBgTBxDwEkoh7AXHC7FF4kvK+w+oNMwPYOPiySqBdB/K8NiRz
270     EVwiEd7jnwBxyLMYwOslk34n1hadZEQU8jCQrG6CqqWZWkn7BbA576gphZQYncGSKZtViznfVfWI
271     JYuPy18gXQWzh7QkCYERCG257EsjrwGj/J5qvWJ1PbSSdzzFqesiQ0yOON4Bbq4uwcClxOAS65nB
272     r+yFoCMFpPyGLOUsQW9Iyg8wqG3dIZLjbrHLfQXybtpaHw28LdpLZXrBXJBUSJ4HhQC3E6iViRv+
273     E4ZMo1nQZgTF1xq21YRXSkcc4L+8gMvMC7exwHHumNfmHA0FYqmxtvZrOi62iPL0tzO3lOg2HTvy
274     lsl26+i46ZMtPDm4aYbXzmUe7vlCxpk0mnEl5EuMvXQj6gbbTThvzhBkrwRkK8eO20oyE2nMxWbt
275     nRi4FZe7Aw1UUdN24McmuiAcA2iB1VWBnPb1BRVaXhhfmqgFcIVfYIgYnuz8AZIu0CEtgJ6QboX8
276     AzQBfT00HzBwhLxCIYzLA5hXeIKERBkPSAqDs9fU4ewkiYkNA2prockzz9+++KcxF0IglwMh16Vv
277     AGkNEDPLLhTN6msqdSU0QKud6uvSGjsSFaL+EvWlrSeyDtBsAoHgfBEyESCN4kLx7ArDx7AIh3ev
278     2d4QoxYZMMhDfgQlUG4HWBo5IjXAWwQZo9Yef2AdwegIMITRzNh1RHsGIIoejsBOWWAZe2e69flQ
279     uYAiQ5VcC5QPaIJgOjMG9IaEGQKBc9/c9CIgT7gRfavPTk/n4B5w1hMFIZAGQmSBgVB3pI3u0B3A
280     9Je8lSw7OHvBcveCoWUiYiMkm7eh9JMRCEG5x9gUxJKo6E1gI7WP6fEAbEkWCANbA6fxrALggS+g
281     iEmeH0i6AdGSfzdYOAsCo+VgGcO8SygW8pzng8lQWJHMvDLmDMwYBslBTh96zIGUiFKQ9wfpp+XG
282     uISABxOsQbXpEBCVVrwC5KkFnDjKFIIYFIFHWE3hAUgQBlJ80WdrRDXPWclrV4Jgc3ldqEhFjJBx
283     BwB7N5eIS6A9FtZmdrEE7MmMELcECwEJU9IJh0yCKdQhLKhYw3xBWev6JhgYSGGOs7ry/pSNaSiF
284     HP648wZJkgykiRJNYAPzMFcc2qWcO3/XpqEGXcjpz+r436A93599F3UwMKT4/WcEQxBgW/9AUNIj
285     VVjUJLBGAD0jxBTCEqTwqTjOwklBCnh1SYhs9yJJg6rBgEg+ZEeyQqMJTCmWSpxAuLADN+vgzI8Z
286     gGo61q6whSk1MqCRNTJEoamSJ9QcQRkaTYx8ga0t/NiCgZAWoGkVSzi1MG02EzWxYQbmQqQRP5fh
287     +73gTB77xwdYQ9QOB2YF05/TMEiUglQawHAQvSyJB5wPcjS8zSBzZwYgMjNAFEJeixcISyghgsP0
288     UYNIPCATK5gf1JEiM4dkwPdtyzJGEu3kB6/dcW/skONoqQ8ri4M4fGpHwn0BeIpEGsnBbEkX6vjf
289     OktAku4D6zAqH7ebzrSIhqAz/FJORMIL5NCabyjIY94RDPH8PMEiy5dTO8z8MK1SOxJb+77mBeAs
290     a0PvJVCB725QQlLDSiTtD7bkeY+8bbKATzikrg+lnnyoG4pK9IhtRENqTDRAuhIGNFlSSoSW7/4u
291     5IpwoSEBdhhE

  ViewVC Help
Powered by ViewVC 1.1.20