← Back to branch summary

~ubuntu-branches/ubuntu/utopic/plee-the-bear/utopic

« back to all changes in this revision

Viewing changes to debian/patches/wx3.0-compat.patch

  • Committer: Package Import Robot
  • Author(s): Olly Betts
  • Date: 2014-07-25 10:58:41 UTC
  • mfrom: (6.1.5 sid)
  • Revision ID: package-import@ubuntu.com-20140725105841-7bji857ffzhp4gb9
Tags: 0.6.0-3.1
http://bugs.debian.org/750087
* Non-maintainer upload at maitainer's request.
* Update to use wxWidgets 3.0 (new patch wx3.0-compat.patch)
  (Closes: #750087)

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/wx3.0-compat.patch
 
1
Description: Fix to build with wxwidgets3.0
 
2
Author: Olly Betts <olly@survex.com>
 
3
Last-Update: 2014-06-01
 
4
 
 
5
--- plee-the-bear-0.6.0.orig/bear-factory/bear-editor/src/bf/code/base_editor_application.cpp
 
6
+++ plee-the-bear-0.6.0/bear-factory/bear-editor/src/bf/code/base_editor_application.cpp
 
7
@@ -271,11 +271,10 @@ bool bf::base_editor_application::find_a
 
8
 
 
9
   if ( index != 0 )
 
10
     {
 
11
-      for ( int i=index; (i+1 != argc); ++i )
 
12
+      for ( int i=index; (i != argc); ++i )
 
13
         argv[i] = argv[i+1];
 
14
 
 
15
       --argc;
 
16
-      argv[argc] = NULL;
 
17
     }
 
18
 
 
19
   return index != 0;