[csw-devel] SF.net SVN: gar:[7238] csw/mgar/pkg
dmichelsen at users.sourceforge.net
dmichelsen at users.sourceforge.net
Thu Nov 12 11:00:51 CET 2009
Revision: 7238
http://gar.svn.sourceforge.net/gar/?rev=7238&view=rev
Author: dmichelsen
Date: 2009-11-12 10:00:50 +0000 (Thu, 12 Nov 2009)
Log Message:
-----------
xchm: Initial commit
Added Paths:
-----------
csw/mgar/pkg/xchm/
csw/mgar/pkg/xchm/branches/
csw/mgar/pkg/xchm/tags/
csw/mgar/pkg/xchm/trunk/
csw/mgar/pkg/xchm/trunk/Makefile
csw/mgar/pkg/xchm/trunk/checksums
csw/mgar/pkg/xchm/trunk/files/
csw/mgar/pkg/xchm/trunk/files/0001-Fix-extra-comma-at-end-of-enum.patch
csw/mgar/pkg/xchm/trunk/files/0002-Remove-W-Wall-for-Sun-Studio.patch
csw/mgar/pkg/xchm/trunk/files/0003-Use-inttypes.h-instead-of-stdint.h.patch
Property changes on: csw/mgar/pkg/xchm/trunk
___________________________________________________________________
Added: svn:ignore
+ cookies
download
work
Added: svn:externals
+ gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2
Added: csw/mgar/pkg/xchm/trunk/Makefile
===================================================================
--- csw/mgar/pkg/xchm/trunk/Makefile (rev 0)
+++ csw/mgar/pkg/xchm/trunk/Makefile 2009-11-12 10:00:50 UTC (rev 7238)
@@ -0,0 +1,28 @@
+GARNAME = xchm
+GARVERSION = 1.17
+CATEGORIES = utils
+
+DESCRIPTION = Cross-platform GUI front-end to chmlib (.chm reader)
+define BLURB
+ xCHM is a cross-platform GUI front-end to chmlib, with borrowed bits from Pabs' chmdeco project.
+ xCHM can show the content tree if one is available, print pages, change font face and size,
+ remember bookmarks, display a searchable index, and search for words in the current page and the whole book.
+endef
+
+MASTER_SITES = $(SF_MIRRORS)
+DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz
+PATCHFILES = 0001-Fix-extra-comma-at-end-of-enum.patch
+PATCHFILES += 0002-Remove-W-Wall-for-Sun-Studio.patch
+PATCHFILES += 0003-Use-inttypes.h-instead-of-stdint.h.patch
+
+# We define upstream file regex so we can be notifed of new upstream software release
+UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz
+
+REQUIRED_PKGS = CSWchmlib CSWwxwidgetscommon CSWwxwidgetsgtk2
+PREREQUISITE_PKGS = $(REQUIRED_PGKS) CSWwxwidgetsdevel
+
+CONFIGURE_ARGS = $(DIRPATHS)
+
+TEST_SCRIPTS =
+
+include gar/category.mk
Added: csw/mgar/pkg/xchm/trunk/checksums
===================================================================
--- csw/mgar/pkg/xchm/trunk/checksums (rev 0)
+++ csw/mgar/pkg/xchm/trunk/checksums 2009-11-12 10:00:50 UTC (rev 7238)
@@ -0,0 +1,4 @@
+3dd1f6628a7ecfd1d65f0b93451fad48 0001-Fix-extra-comma-at-end-of-enum.patch
+c9e7de423f7a79f280aee0ed3dc3e0f7 0002-Remove-W-Wall-for-Sun-Studio.patch
+6b248d3b57a9b479be69a7c8475bdc66 0003-Use-inttypes.h-instead-of-stdint.h.patch
+4f34bc046fcc59f1af590d8eb1e08934 xchm-1.17.tar.gz
Added: csw/mgar/pkg/xchm/trunk/files/0001-Fix-extra-comma-at-end-of-enum.patch
===================================================================
--- csw/mgar/pkg/xchm/trunk/files/0001-Fix-extra-comma-at-end-of-enum.patch (rev 0)
+++ csw/mgar/pkg/xchm/trunk/files/0001-Fix-extra-comma-at-end-of-enum.patch 2009-11-12 10:00:50 UTC (rev 7238)
@@ -0,0 +1,25 @@
+From f327a8fe2df06b49bb7ad3dcec2f75108bea1e3c Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen <dam at opencsw.org>
+Date: Thu, 12 Nov 2009 10:39:08 +0100
+Subject: [PATCH 1/3] Fix extra comma at end of enum
+
+---
+ src/chmframe.h | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/src/chmframe.h b/src/chmframe.h
+index 62a3f52..1dc59a1 100644
+--- a/src/chmframe.h
++++ b/src/chmframe.h
+@@ -79,7 +79,7 @@ enum
+ ID_RegisterExtension,
+ ID_CloseTab,
+ ID_NewTab,
+- ID_TreeCtrl = 1000,
++ ID_TreeCtrl = 1000
+ };
+
+
+--
+1.6.5
+
Added: csw/mgar/pkg/xchm/trunk/files/0002-Remove-W-Wall-for-Sun-Studio.patch
===================================================================
--- csw/mgar/pkg/xchm/trunk/files/0002-Remove-W-Wall-for-Sun-Studio.patch (rev 0)
+++ csw/mgar/pkg/xchm/trunk/files/0002-Remove-W-Wall-for-Sun-Studio.patch 2009-11-12 10:00:50 UTC (rev 7238)
@@ -0,0 +1,39 @@
+From 042ab4f6497309a3488d73538f816e9a88c851de Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen <dam at opencsw.org>
+Date: Thu, 12 Nov 2009 10:41:55 +0100
+Subject: [PATCH 2/3] Remove -W -Wall for Sun Studio
+
+---
+ configure | 2 +-
+ configure.in | 2 +-
+ 6 files changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/configure b/configure
+index 50a3330..c5da2c9 100755
+--- a/configure
++++ b/configure
+@@ -5385,7 +5385,7 @@ wx_config_minor_version=`echo $WX_VERSION | \
+ sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\2/'`
+
+ CPPFLAGS="$CPPFLAGS $WX_CPPFLAGS"
+-CXXFLAGS="$CXXFLAGS $WX_CXXFLAGS_ONLY -W -Wall"
++CXXFLAGS="$CXXFLAGS $WX_CXXFLAGS_ONLY"
+ CFLAGS="$CFLAGS $WX_CFLAGS_ONLY"
+
+
+diff --git a/configure.in b/configure.in
+index 82e4125..6b108d3 100644
+--- a/configure.in
++++ b/configure.in
+@@ -34,7 +34,7 @@ wx_config_minor_version=`echo $WX_VERSION | \
+ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
+
+ CPPFLAGS="$CPPFLAGS $WX_CPPFLAGS"
+-CXXFLAGS="$CXXFLAGS $WX_CXXFLAGS_ONLY -W -Wall"
++CXXFLAGS="$CXXFLAGS $WX_CXXFLAGS_ONLY"
+ CFLAGS="$CFLAGS $WX_CFLAGS_ONLY"
+
+
+--
+1.6.5
+
Added: csw/mgar/pkg/xchm/trunk/files/0003-Use-inttypes.h-instead-of-stdint.h.patch
===================================================================
--- csw/mgar/pkg/xchm/trunk/files/0003-Use-inttypes.h-instead-of-stdint.h.patch (rev 0)
+++ csw/mgar/pkg/xchm/trunk/files/0003-Use-inttypes.h-instead-of-stdint.h.patch 2009-11-12 10:00:50 UTC (rev 7238)
@@ -0,0 +1,39 @@
+From 514f5e2682428b392fb5027b04f4557a837dbb64 Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen <dam at opencsw.org>
+Date: Thu, 12 Nov 2009 10:42:32 +0100
+Subject: [PATCH 3/3] Use inttypes.h instead of stdint.h
+
+---
+ src/bitfiddle.inl | 2 +-
+ src/chmfile.h | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/bitfiddle.inl b/src/bitfiddle.inl
+index 3edd779..6bbb2ae 100644
+--- a/src/bitfiddle.inl
++++ b/src/bitfiddle.inl
+@@ -23,7 +23,7 @@
+
+
+ #include <wx/string.h>
+-#include <stdint.h>
++#include <inttypes.h>
+
+
+ #define FIXENDIAN16(x) (x = wxUINT16_SWAP_ON_BE(x))
+diff --git a/src/chmfile.h b/src/chmfile.h
+index dc00013..d740d20 100644
+--- a/src/chmfile.h
++++ b/src/chmfile.h
+@@ -24,7 +24,7 @@
+ #define __CHMFILE_H_
+
+ #include <config.h>
+-#include <stdint.h>
++#include <inttypes.h>
+ #include <chm_lib.h>
+ #include <wx/filefn.h>
+ #include <wx/string.h>
+--
+1.6.5
+
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the devel
mailing list