wok diff comical/stuff/comical-0.8_wx-2.8.patch @ rev 19980

Up kriss_feed (8.7)
author Pascal Bellard <pascal.bellard@slitaz.org>
date Thu Jun 15 08:14:05 2017 +0200 (2017-06-15)
parents
children
line diff
     1.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     1.2 +++ b/comical/stuff/comical-0.8_wx-2.8.patch	Thu Jun 15 08:14:05 2017 +0200
     1.3 @@ -0,0 +1,51 @@
     1.4 +--- "a/Comical Icons/comical.xpm"
     1.5 ++++ "b/Comical Icons/comical.xpm"
     1.6 +@@ -1,5 +1,5 @@
     1.7 + /* XPM */
     1.8 +-static char *comical_xpm[]={
     1.9 ++static const char *comical_xpm[]={
    1.10 + "128 128 131 2",
    1.11 + "Qt c None",
    1.12 + ".8 c #080000",
    1.13 +--- a/src/ComicalApp.cpp
    1.14 ++++ b/src/ComicalApp.cpp
    1.15 +@@ -28,6 +28,8 @@
    1.16 + #include "ComicalApp.h"
    1.17 + #include "ComicalFrame.h"
    1.18 + #include <wx/log.h>
    1.19 ++#include <wx/icon.h>
    1.20 ++#include <wx/numdlg.h>
    1.21 + 
    1.22 + #if !defined(__WXMAC__) && !defined(__WXCOCOA__) && !defined(__WXMSW__) && !defined(__WXPM__)
    1.23 + #include "../Comical Icons/comical.xpm"
    1.24 +--- a/src/ComicBook.cpp
    1.25 ++++ b/src/ComicBook.cpp
    1.26 +@@ -537,7 +537,8 @@
    1.27 + 			if (curr > 0) {	// ftw and fth scaling requires previous page to
    1.28 + 				target--;	// do FitWithoutScrollbars.
    1.29 + 				if (target > high)
    1.30 +-					target = curr - (++target - high);
    1.31 ++					// target = curr - (++target - high); // will cause 'target' uninitialized warning
    1.32 ++					target = curr - ((target + 1) - high);
    1.33 + 			} else if (target > high)
    1.34 + 				target = curr - (target - high);
    1.35 + 			try {
    1.36 +--- a/Makefile
    1.37 ++++ b/Makefile
    1.38 +@@ -1,8 +1,8 @@
    1.39 + CC = `wx-config --cxx`
    1.40 +-LDFLAGS = `wx-config --libs` -Lunrar -lunrar -Lunzip -lminiunzip
    1.41 ++LDFLAGS = `wx-config --libs` -Lunrar -lunrar -Lunzip -lminiunzip -lz
    1.42 + INSTALL = install
    1.43 + INSTALL_PROGRAM = $(INSTALL)
    1.44 +-prefix = /usr/local
    1.45 ++prefix = /usr
    1.46 + exec_prefix = $(prefix)
    1.47 + bindir = $(exec_prefix)/bin
    1.48 + 
    1.49 +@@ -43,4 +43,4 @@
    1.50 + 	$(MAKE) clean -C unzip
    1.51 + 	rm -f $(DEPS) bin2h src/bin2h.o
    1.52 + 
    1.53 +-.PHONY : install install-strip uninstall clean distclean
    1.54 ++.PHONY : all install install-strip uninstall clean distclean