[med-svn] [Git][med-team/gentle][master] Migrating font selection to wxWidgets 3.2

[Steffen Möller (@moeller)]

Steffen Möller pushed to branch master at Debian Med / gentle


Commits:
2103948d by Steffen Moeller at 2023-07-30T01:28:14+02:00
Migrating font selection to wxWidgets 3.2

- - - - -


3 changed files:

- debian/changelog
- + debian/patches/MissingReturnValueInNonVoidFunction.patch
- debian/patches/series


Changes:

=====================================
debian/changelog
=====================================
@@ -1,13 +1,17 @@
+gentle (1.9+cvs20100605+dfsg1-12) UNRELEASED; urgency=medium
+
+  * Added more patches to eradicate compiler warnings on font selection.
+
+ -- Steffen Moeller <moeller at debian.org>  Sun, 30 Jul 2023 01:21:41 +0200
+
 gentle (1.9+cvs20100605+dfsg1-11) unstable; urgency=medium
 
   * clang pointed to mismatch between dynamic allocations of arrays
-    with new and omitted []s in corresponding delete
-    (forwarded as PR#3)
-  * Fixed prior unnoticed issues with operator precedence
-    (forwarded as PR#4)
+    with new and omitted []s in corresponding delete (forwarded as PR#3)
+  * Fixed prior unnoticed issues with operator precedence (forwarded as PR#4)
   * Standards-Version: 4.6.2
 
- -- Steffen Moeller <moeller at debian.org>
+ -- Steffen Moeller <moeller at debian.org>  Sun, 29 Jul 2023 00:08:55 +0200
  
 gentle (1.9+cvs20100605+dfsg1-10) unstable; urgency=medium
 
@@ -199,3 +203,4 @@ gentle (1.9+cvs20100531-1) experimental; urgency=low
   * Initial release.
 
  -- Steffen Moeller <moeller at debian.org>  Tue, 25 May 2010 00:08:31 +0200
+


=====================================
debian/patches/MissingReturnValueInNonVoidFunction.patch
=====================================
@@ -0,0 +1,63 @@
+Index: gentle/TRestrictionEditor.cpp
+===================================================================
+--- gentle.orig/TRestrictionEditor.cpp
++++ gentle/TRestrictionEditor.cpp
+@@ -36,6 +36,9 @@ bool operator < ( const TREcache c1 , co
+         return global_sort_ascending?(c1.enzyme<c2.enzyme):(c1.enzyme>c2.enzyme);
+     else if ( global_sort_mode == BY_CUTS )
+         return global_sort_ascending?(c1.cut<c2.cut):(c1.cut>c2.cut);
++    fprintf(stderr,"E: This should not be reached in bool operator < ( const TREcache c1 , const TREcache c2 )\n");
++    assert(0);
++    return 0;
+ }
+ 
+ bool operator == ( const TREcache c1 , const TREcache c2 )
+@@ -44,6 +47,9 @@ bool operator == ( const TREcache c1 , c
+         return c1.enzyme == c2.enzyme ;
+     else if ( global_sort_mode == BY_CUTS )
+         return c1.cut == c2.cut ;
++    fprintf(stderr,"E: This should not be reached in bool operator == ( const TREcache c1 , const TREcache c2 )\n");
++    assert(0);
++    return 0;
+ }
+ 
+ //******************************************************************************    
+Index: gentle/SequenceTypeAA.cpp
+===================================================================
+--- gentle.orig/SequenceTypeAA.cpp
++++ gentle/SequenceTypeAA.cpp
+@@ -21,6 +21,7 @@ int SeqAA::arrange ( int n )
+     {
+     if ( useDirectRoutines() ) return arrange_direct ( n ) ;
+     wxMessageBox ( _T("One has to wonder...1") ) ;
++    assert(0);
+     }
+     
+ void SeqAA::show ( wxDC& dc )
+Index: gentle/SequenceTypes.cpp
+===================================================================
+--- gentle.orig/SequenceTypes.cpp
++++ gentle/SequenceTypes.cpp
+@@ -84,7 +84,7 @@ bool SeqPrimer::useDirectRoutines () { r
+ int SeqPrimer::arrange_direct ( int n )
+     {
+ //    arrange ( n ) ;
+-    SeqDNA::arrange_direct ( n ) ;
++    return SeqDNA::arrange_direct ( n ) ;
+     }    
+ 
+ void SeqPrimer::show_direct ( wxDC& dc )
+Index: gentle/ipc/ipc.cpp
+===================================================================
+--- gentle.orig/ipc/ipc.cpp
++++ gentle/ipc/ipc.cpp
+@@ -381,7 +381,8 @@ int TIPC::ipc_main(int argc,char **argv)
+       return 16;
+     }
+ 
+-  return 0;*/
++*/
++  return 0;
+ }
+ 
+ 


=====================================
debian/patches/series
=====================================
@@ -1,3 +1,4 @@
+MissingReturnValueInNonVoidFunction.patch
 OperatorPrecedence.patch
 AdjustDeleteForArrays.patch
 forward_slashes.patch
@@ -7,3 +8,4 @@ remove-sqlite-dep.patch
 wx3.0-compat.patch
 fix-format-codes.patch
 wx3.2-compat.patch
+FontSelection.patch



View it on GitLab: https://salsa.debian.org/med-team/gentle/-/commit/2103948d83efbfc06d347a3a471c3b87fa588db9

-- 
View it on GitLab: https://salsa.debian.org/med-team/gentle/-/commit/2103948d83efbfc06d347a3a471c3b87fa588db9
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-med-commit/attachments/20230729/f09d18f5/attachment-0001.htm>