# HG changeset patch
# User Aleksej Bobylev <al.bobylev@gmail.com>
# Date 1362044822 0
# Node ID fff8d437ac2daa112817b979797f6f4480de26fe
# Parent  65e1d71b872f76794025fed71f9d108c29fd666a
comical, cpu-g: move from undigest wok

diff -r 65e1d71b872f -r fff8d437ac2d comical/description.txt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/comical/description.txt	Thu Feb 28 09:47:02 2013 +0000
@@ -0,0 +1,3 @@
+Comical is a portable CBR and CBZ viewer written in C++ using wxWidgets.
+It supports multiple image formats and uses high-quality image scaling
+algorithms to fit pages onscreen.
diff -r 65e1d71b872f -r fff8d437ac2d comical/receipt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/comical/receipt	Thu Feb 28 09:47:02 2013 +0000
@@ -0,0 +1,27 @@
+# SliTaz package receipt.
+
+PACKAGE="comical"
+VERSION="0.8"
+CATEGORY="graphics"
+SHORT_DESC="Comic book reader"
+MAINTAINER="al.bobylev@gmail.com"
+WEB_SITE="http://comical.sourceforge.net/"
+TARBALL="$PACKAGE-$VERSION.tar.gz"
+WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
+
+DEPENDS="wxWidgets"
+BUILD_DEPENDS="wxWidgets-dev"
+
+# Rules to configure and make the package.
+compile_rules()
+{
+	patch -p1 -i $stuff/comical-0.8_wx-2.8.patch
+	make -j 1
+}
+
+# Rules to gen a SliTaz package suitable for Tazpkg.
+genpkg_rules()
+{
+	mkdir -p $fs/usr/bin
+	cp -a $src/comical $fs/usr/bin
+}
diff -r 65e1d71b872f -r fff8d437ac2d comical/stuff/comical-0.8_wx-2.8.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/comical/stuff/comical-0.8_wx-2.8.patch	Thu Feb 28 09:47:02 2013 +0000
@@ -0,0 +1,51 @@
+--- "a/Comical Icons/comical.xpm"
++++ "b/Comical Icons/comical.xpm"
+@@ -1,5 +1,5 @@
+ /* XPM */
+-static char *comical_xpm[]={
++static const char *comical_xpm[]={
+ "128 128 131 2",
+ "Qt c None",
+ ".8 c #080000",
+--- a/src/ComicalApp.cpp
++++ b/src/ComicalApp.cpp
+@@ -28,6 +28,8 @@
+ #include "ComicalApp.h"
+ #include "ComicalFrame.h"
+ #include <wx/log.h>
++#include <wx/icon.h>
++#include <wx/numdlg.h>
+ 
+ #if !defined(__WXMAC__) && !defined(__WXCOCOA__) && !defined(__WXMSW__) && !defined(__WXPM__)
+ #include "../Comical Icons/comical.xpm"
+--- a/src/ComicBook.cpp
++++ b/src/ComicBook.cpp
+@@ -537,7 +537,8 @@
+ 			if (curr > 0) {	// ftw and fth scaling requires previous page to
+ 				target--;	// do FitWithoutScrollbars.
+ 				if (target > high)
+-					target = curr - (++target - high);
++					// target = curr - (++target - high); // will cause 'target' uninitialized warning
++					target = curr - ((target + 1) - high);
+ 			} else if (target > high)
+ 				target = curr - (target - high);
+ 			try {
+--- a/Makefile
++++ b/Makefile
+@@ -1,8 +1,8 @@
+ CC = `wx-config --cxx`
+-LDFLAGS = `wx-config --libs` -Lunrar -lunrar -Lunzip -lminiunzip
++LDFLAGS = `wx-config --libs` -Lunrar -lunrar -Lunzip -lminiunzip -lz
+ INSTALL = install
+ INSTALL_PROGRAM = $(INSTALL)
+-prefix = /usr/local
++prefix = /usr
+ exec_prefix = $(prefix)
+ bindir = $(exec_prefix)/bin
+ 
+@@ -43,4 +43,4 @@
+ 	$(MAKE) clean -C unzip
+ 	rm -f $(DEPS) bin2h src/bin2h.o
+ 
+-.PHONY : install install-strip uninstall clean distclean
++.PHONY : all install install-strip uninstall clean distclean
diff -r 65e1d71b872f -r fff8d437ac2d comical/stuff/comical.desktop
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/comical/stuff/comical.desktop	Thu Feb 28 09:47:02 2013 +0000
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Type=Application
+Name=Comical
+Comment=Comic book reader
+Icon=alarm-clock
+Exec=comical
+Terminal=false
+StartupNotify=true
+Categories=Graphics;Viewer;
+MimeType=application/x-cbz;application/x-cbr;
diff -r 65e1d71b872f -r fff8d437ac2d comical/stuff/comical.png
Binary file comical/stuff/comical.png has changed
diff -r 65e1d71b872f -r fff8d437ac2d cpu-g/description.txt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/cpu-g/description.txt	Thu Feb 28 09:47:02 2013 +0000
@@ -0,0 +1,3 @@
+CPU-G is an application that shows useful information about your hardware. It
+collects and displays information about your CPU, RAM, Motherboard, some
+general information about your system and more.
diff -r 65e1d71b872f -r fff8d437ac2d cpu-g/receipt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/cpu-g/receipt	Thu Feb 28 09:47:02 2013 +0000
@@ -0,0 +1,30 @@
+# SliTaz package receipt.
+
+PACKAGE="cpu-g"
+VERSION="0.9.0"
+CATEGORY="utilities"
+SHORT_DESC="Shows useful information about your hardware"
+MAINTAINER="al.bobylev@gmail.com"
+LICENSE="GPL-3"
+WEB_SITE="http://cpug.sourceforge.net/"
+TARBALL="$PACKAGE-$VERSION.tar.gz"
+WGET_URL="$SF_MIRROR/cpug/$TARBALL"
+
+DEPENDS="pygtk"
+
+# Rules to gen a SliTaz package suitable for Tazpkg.
+genpkg_rules()
+{
+	sed -i 's|data/logos/|/usr/share/cpu-g/logos/|' $src/cpu-g
+	sed -i 's|cpu-g.glade|/usr/share/cpu-g/cpu-g.glade|' $src/cpu-g
+	sed -i 's|data/cpu-g.png|/usr/share/pixmaps/cpu-g.png|' $src/cpu-g.glade
+	mkdir -p \
+		$fs/usr/bin \
+		$fs/usr/share/applications \
+		$fs/usr/share/cpu-g \
+		$fs/usr/share/pixmaps
+	cp -a $src/cpu-g $fs/usr/bin
+	cp -a $src/cpu-g.glade $fs/usr/share/cpu-g
+	cp -a $src/data/logos $fs/usr/share/cpu-g
+	cp -a $src/data/cpu-g.png $fs/usr/share/pixmaps
+}
diff -r 65e1d71b872f -r fff8d437ac2d cpu-g/stuff/cpu-g.desktop
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/cpu-g/stuff/cpu-g.desktop	Thu Feb 28 09:47:02 2013 +0000
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Type=Application
+Name=CPU-G
+Exec=/usr/bin/cpu-g
+Terminal=false
+Icon=cpu-g
+StartupNotify=true
+Categories=System;Monitor;