r9357 - in packages/trunk/xmahjongg/debian: . patches

[Peter Pentchev]

Author: roam-guest
Date: 2009-04-02 14:03:52 +0000 (Thu, 02 Apr 2009)
New Revision: 9357

Modified:
   packages/trunk/xmahjongg/debian/changelog
   packages/trunk/xmahjongg/debian/patches/03-compiler-warnings.patch
Log:
Fix a couple of const char * warnings.


Modified: packages/trunk/xmahjongg/debian/changelog
===================================================================
--- packages/trunk/xmahjongg/debian/changelog	2009-04-02 13:40:43 UTC (rev 9356)
+++ packages/trunk/xmahjongg/debian/changelog	2009-04-02 14:03:52 UTC (rev 9357)
@@ -26,8 +26,10 @@
   * Convert the copyright file to the machine-parseable format and
     actually list all the relevant files' licenses there.
   * Build with -Werror if "werror" is specified in DEB_BUILD_OPTIONS.
-  * Make the configure script produce the same result with or without
-    the -Werror flag at the warnings level used.
+  * Fix some compiler warnings:
+    - make the configure script produce the same result with or without
+      the -Werror flag at the warnings level used
+    - fix a couple of const char * warnings
 
  -- Peter Pentchev <roam at ringlet.net>  Tue, 31 Mar 2009 17:19:37 +0300
 

Modified: packages/trunk/xmahjongg/debian/patches/03-compiler-warnings.patch
===================================================================
--- packages/trunk/xmahjongg/debian/patches/03-compiler-warnings.patch	2009-04-02 13:40:43 UTC (rev 9356)
+++ packages/trunk/xmahjongg/debian/patches/03-compiler-warnings.patch	2009-04-02 14:03:52 UTC (rev 9357)
@@ -1,4 +1,5 @@
 Make the configure script produce the same result with or without -Werror.
+Fix a couple of const char * warnings.
 
 --- a/configure
 +++ b/configure
@@ -20,3 +21,34 @@
    return 0;
  
    ;
+--- a/liblcdf/string.cc
++++ b/liblcdf/string.cc
+@@ -37,7 +37,7 @@
+ 
+ inline
+ String::Memo::Memo()
+-    : _refcount(0), _capacity(0), _dirty(0), _real_data("")
++    : _refcount(0), _capacity(0), _dirty(0), _real_data(new char[1])
+ {
+ }
+ 
+--- a/src/main.cc
++++ b/src/main.cc
+@@ -230,7 +230,7 @@
+ 
+ 
+ Button *
+-new_button(Panel *panel, char *name)
++new_button(Panel *panel, const char *name)
+ {
+   char buf[100];
+   Button *but = new Button(panel);
+@@ -708,7 +708,7 @@
+     XStringListToTextProperty(woog, 1, &window_name_prop);
+     XStringListToTextProperty(woog, 1, &icon_name_prop);
+     class_hint.res_name = (char *)(x_name ? x_name : program_name);
+-    class_hint.res_class = "XMahjongg";
++    class_hint.res_class = (char *)"XMahjongg";
+ 
+     XResizeWindow(display, window, size_hint->width, size_hint->height);
+     XSetWMProperties(display, window, &window_name_prop, &icon_name_prop,