wok annotate comical/stuff/comical-0.8_wx-2.8.patch @ rev 16395

UP: hostapd (2.1), fix libnl missing pkgconfig file and add to ARM with rfkill
author Christophe Lincoln <pankso@slitaz.org>
date Wed Apr 16 03:02:41 2014 +0200 (2014-04-16)
parents
children
rev   line source
al@14128 1 --- "a/Comical Icons/comical.xpm"
al@14128 2 +++ "b/Comical Icons/comical.xpm"
al@14128 3 @@ -1,5 +1,5 @@
al@14128 4 /* XPM */
al@14128 5 -static char *comical_xpm[]={
al@14128 6 +static const char *comical_xpm[]={
al@14128 7 "128 128 131 2",
al@14128 8 "Qt c None",
al@14128 9 ".8 c #080000",
al@14128 10 --- a/src/ComicalApp.cpp
al@14128 11 +++ b/src/ComicalApp.cpp
al@14128 12 @@ -28,6 +28,8 @@
al@14128 13 #include "ComicalApp.h"
al@14128 14 #include "ComicalFrame.h"
al@14128 15 #include <wx/log.h>
al@14128 16 +#include <wx/icon.h>
al@14128 17 +#include <wx/numdlg.h>
al@14128 18
al@14128 19 #if !defined(__WXMAC__) && !defined(__WXCOCOA__) && !defined(__WXMSW__) && !defined(__WXPM__)
al@14128 20 #include "../Comical Icons/comical.xpm"
al@14128 21 --- a/src/ComicBook.cpp
al@14128 22 +++ b/src/ComicBook.cpp
al@14128 23 @@ -537,7 +537,8 @@
al@14128 24 if (curr > 0) { // ftw and fth scaling requires previous page to
al@14128 25 target--; // do FitWithoutScrollbars.
al@14128 26 if (target > high)
al@14128 27 - target = curr - (++target - high);
al@14128 28 + // target = curr - (++target - high); // will cause 'target' uninitialized warning
al@14128 29 + target = curr - ((target + 1) - high);
al@14128 30 } else if (target > high)
al@14128 31 target = curr - (target - high);
al@14128 32 try {
al@14128 33 --- a/Makefile
al@14128 34 +++ b/Makefile
al@14128 35 @@ -1,8 +1,8 @@
al@14128 36 CC = `wx-config --cxx`
al@14128 37 -LDFLAGS = `wx-config --libs` -Lunrar -lunrar -Lunzip -lminiunzip
al@14128 38 +LDFLAGS = `wx-config --libs` -Lunrar -lunrar -Lunzip -lminiunzip -lz
al@14128 39 INSTALL = install
al@14128 40 INSTALL_PROGRAM = $(INSTALL)
al@14128 41 -prefix = /usr/local
al@14128 42 +prefix = /usr
al@14128 43 exec_prefix = $(prefix)
al@14128 44 bindir = $(exec_prefix)/bin
al@14128 45
al@14128 46 @@ -43,4 +43,4 @@
al@14128 47 $(MAKE) clean -C unzip
al@14128 48 rm -f $(DEPS) bin2h src/bin2h.o
al@14128 49
al@14128 50 -.PHONY : install install-strip uninstall clean distclean
al@14128 51 +.PHONY : all install install-strip uninstall clean distclean