← Back to branch summary

~peter-pearse/ubuntu/oneiric/x11-apps/prop001

« back to all changes in this revision

Viewing changes to debian/patches/06_xclock_geometry.diff

  • Committer: Bazaar Package Importer
  • Author(s): Brice Goglin, Julien Cristau, Brice Goglin
  • Date: 2009-12-06 12:23:46 UTC
  • Revision ID: james.westby@ubuntu.com-20091206122346-7r0tbgnaby4qdh82
Tags: 7.5+1
http://bugs.debian.org/536410
http://bugs.debian.org/518383
http://bugs.debian.org/489998
[ Julien Cristau ]
* Update xload config.{guess,sub}, adding avr32 support (closes: #536410)
* Improve the long description using patch from Justin B Rye (closes:
  #549457).  Thanks!

[ Brice Goglin ]
* Add ico 1.0.2, closes: #518383.
* bitmap 1.0.4.
* xclipboard 1.1.0.
  + Add UTF8 support, closes: #489998.
* xclock 1.0.4.
  + Drop 06_xclock_geometry.diff, applied upstream.
* xcursorgen 1.0.3.
* xeyes 1.0.991.
* xgc 1.0.2.
* xmag 1.0.3.
* xman 1.1.0.
* xwd 1.0.3.
  + Drop 01_xwd_do_not_spew_usage_on_connection_error.diff, applied upstream.
* xwud 1.0.2.
* Refresh patches.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/06_xclock_geometry.diff
1
 
From upstream commits 870ebb6762f63c6587ee75aba50ee93257fa610b and
2
 
8c6739ba1179337c7f8fa25680871e0813ef5181.
3
 
 
4
 
Index: x11-apps-7.3+1.0/xclock/Clock.c
5
 
===================================================================
6
 
--- x11-apps-7.3+1.0.orig/xclock/Clock.c        2008-05-12 19:43:06.000000000 -0400
7
 
+++ x11-apps-7.3+1.0/xclock/Clock.c     2008-05-12 20:29:19.000000000 -0400
8
 
@@ -656,46 +656,48 @@
9
 
                     2 * w->clock.padding;
10
 
        }
11
 
        else
12
 
+       {
13
 
 #endif
14
 
 #ifndef NO_I18N 
15
 
-       if (!no_locale) {
16
 
-          XFontSetExtents *fse;
17
 
+         if (!no_locale) {
18
 
+             XFontSetExtents *fse;
19
 
 
20
 
-          if(w->clock.fontSet == NULL) {
21
 
-              char **missing, *default_str;
22
 
-              int n_missing;
23
 
-              w->clock.fontSet = XCreateFontSet( XtDisplay(w),
24
 
-                XtDefaultFontSet,
25
 
-                &missing,
26
 
-                &n_missing,
27
 
-                &default_str);
28
 
-          }
29
 
-          if (w->clock.fontSet != NULL)
30
 
-          {
31
 
-              /* don't free this... it's freed with the XFontSet. */
32
 
-              fse = XExtentsOfFontSet(w->clock.fontSet);
33
 
-              
34
 
-              min_width = XmbTextEscapement(w->clock.fontSet,str,
35
 
-                len)
36
 
-                + 2 * w->clock.padding;
37
 
-              min_height = fse->max_logical_extent.height +
38
 
-                3 * w->clock.padding;
39
 
-          } else {
40
 
-              no_locale = True;
41
 
-          }
42
 
-       }
43
 
+             if(w->clock.fontSet == NULL) {
44
 
+                 char **missing, *default_str;
45
 
+                 int n_missing;
46
 
+                 w->clock.fontSet = XCreateFontSet( XtDisplay(w),
47
 
+                   XtDefaultFontSet,
48
 
+                   &missing,
49
 
+                   &n_missing,
50
 
+                   &default_str);
51
 
+             }
52
 
+             if (w->clock.fontSet != NULL)
53
 
+             {
54
 
+                 /* don't free this... it's freed with the XFontSet. */
55
 
+                 fse = XExtentsOfFontSet(w->clock.fontSet);
56
 
+
57
 
+                 min_width = XmbTextEscapement(w->clock.fontSet,str,
58
 
+                   len)
59
 
+                   + 2 * w->clock.padding;
60
 
+                 min_height = fse->max_logical_extent.height +
61
 
+                   3 * w->clock.padding;
62
 
+             } else {
63
 
+                 no_locale = True;
64
 
+             }
65
 
+         }
66
 
 
67
 
-       if (!no_locale)
68
 
-#endif /* NO_I18N */
69
 
-       {
70
 
-          if (w->clock.font == NULL)
71
 
-              w->clock.font = XQueryFont( XtDisplay(w),
72
 
-                                          XGContextFromGC(
73
 
-                                           DefaultGCOfScreen(XtScreen(w))) );
74
 
-          min_width = XTextWidth(w->clock.font, str, len) +
75
 
-              2 * w->clock.padding;
76
 
-          min_height = w->clock.font->ascent +
77
 
-              w->clock.font->descent + 2 * w->clock.padding;
78
 
+         if (no_locale)
79
 
+   #endif /* NO_I18N */
80
 
+         {
81
 
+             if (w->clock.font == NULL)
82
 
+                 w->clock.font = XQueryFont( XtDisplay(w),
83
 
+                                             XGContextFromGC(
84
 
+                                              DefaultGCOfScreen(XtScreen(w))) );
85
 
+             min_width = XTextWidth(w->clock.font, str, len) +
86
 
+                 2 * w->clock.padding;
87
 
+             min_height = w->clock.font->ascent +
88
 
+                 w->clock.font->descent + 2 * w->clock.padding;
89
 
+         }
90
 
        }
91
 
     }
92
 
     if (w->core.width == 0)