wok-6.x view comical/stuff/comical-0.8_wx-2.8.patch @ rev 17811
tilda: use static flex library (since flex 2.5.39)
| author | Pascal Bellard <pascal.bellard@slitaz.org> |
|---|---|
| date | Sat Mar 21 11:36:21 2015 +0100 (2015-03-21) |
| parents | |
| children |
line source
1 --- "a/Comical Icons/comical.xpm"
2 +++ "b/Comical Icons/comical.xpm"
3 @@ -1,5 +1,5 @@
4 /* XPM */
5 -static char *comical_xpm[]={
6 +static const char *comical_xpm[]={
7 "128 128 131 2",
8 "Qt c None",
9 ".8 c #080000",
10 --- a/src/ComicalApp.cpp
11 +++ b/src/ComicalApp.cpp
12 @@ -28,6 +28,8 @@
13 #include "ComicalApp.h"
14 #include "ComicalFrame.h"
15 #include <wx/log.h>
16 +#include <wx/icon.h>
17 +#include <wx/numdlg.h>
19 #if !defined(__WXMAC__) && !defined(__WXCOCOA__) && !defined(__WXMSW__) && !defined(__WXPM__)
20 #include "../Comical Icons/comical.xpm"
21 --- a/src/ComicBook.cpp
22 +++ b/src/ComicBook.cpp
23 @@ -537,7 +537,8 @@
24 if (curr > 0) { // ftw and fth scaling requires previous page to
25 target--; // do FitWithoutScrollbars.
26 if (target > high)
27 - target = curr - (++target - high);
28 + // target = curr - (++target - high); // will cause 'target' uninitialized warning
29 + target = curr - ((target + 1) - high);
30 } else if (target > high)
31 target = curr - (target - high);
32 try {
33 --- a/Makefile
34 +++ b/Makefile
35 @@ -1,8 +1,8 @@
36 CC = `wx-config --cxx`
37 -LDFLAGS = `wx-config --libs` -Lunrar -lunrar -Lunzip -lminiunzip
38 +LDFLAGS = `wx-config --libs` -Lunrar -lunrar -Lunzip -lminiunzip -lz
39 INSTALL = install
40 INSTALL_PROGRAM = $(INSTALL)
41 -prefix = /usr/local
42 +prefix = /usr
43 exec_prefix = $(prefix)
44 bindir = $(exec_prefix)/bin
46 @@ -43,4 +43,4 @@
47 $(MAKE) clean -C unzip
48 rm -f $(DEPS) bin2h src/bin2h.o
50 -.PHONY : install install-strip uninstall clean distclean
51 +.PHONY : all install install-strip uninstall clean distclean