Revision: 11929
http://gar.svn.sourceforge.net/gar/?rev=11929&view=rev
Author: dmichelsen
Date: 2010-12-14 11:05:24 +0000 (Tue, 14 Dec 2010)
Log Message:
-----------
xchm: Update to 1.18 and rework patches
Modified Paths:
--------------
csw/mgar/pkg/xchm/trunk/Makefile
csw/mgar/pkg/xchm/trunk/checksums
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
Added Paths:
-----------
csw/mgar/pkg/xchm/trunk/files/0003-Use-inttypes-instead-of-stdint.patch
Removed Paths:
-------------
csw/mgar/pkg/xchm/trunk/files/0003-Use-inttypes.h-instead-of-stdint.h.patch
Modified: csw/mgar/pkg/xchm/trunk/Makefile
===================================================================
--- csw/mgar/pkg/xchm/trunk/Makefile 2010-12-14 09:53:22 UTC (rev 11928)
+++ csw/mgar/pkg/xchm/trunk/Makefile 2010-12-14 11:05:24 UTC (rev 11929)
@@ -1,5 +1,5 @@
NAME = xchm
-VERSION = 1.17
+VERSION = 1.18
CATEGORIES = utils
DESCRIPTION = Cross-platform GUI front-end to chmlib (.chm reader)
@@ -13,12 +13,17 @@
DISTFILES = $(NAME)-$(VERSION).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
+PATCHFILES += 0003-Use-inttypes-instead-of-stdint.patch
# We define upstream file regex so we can be notifed of new upstream software release
UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz
-RUNTIME_DEP_PKGS = CSWchmlib CSWwxwidgetscommon CSWwxwidgetsgtk2
+RUNTIME_DEP_PKGS_CSWxchm = CSWchmlib
+RUNTIME_DEP_PKGS_CSWxchm += CSWwxwidgetscommon
+RUNTIME_DEP_PKGS_CSWxchm += CSWwxwidgetsgtk2
+RUNTIME_DEP_PKGS_CSWxchm += CSWsunmath
+RUNTIME_DEP_PKGS_CSWxchm += CSWncurses
+
BUILD_DEP_PKGS = $(REQUIRED_PGKS) CSWwxwidgetsdevel
CONFIGURE_ARGS = $(DIRPATHS)
Modified: csw/mgar/pkg/xchm/trunk/checksums
===================================================================
--- csw/mgar/pkg/xchm/trunk/checksums 2010-12-14 09:53:22 UTC (rev 11928)
+++ csw/mgar/pkg/xchm/trunk/checksums 2010-12-14 11:05:24 UTC (rev 11929)
@@ -1,4 +1 @@
-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
+07d7a910b3216301a002be5630c71866 xchm-1.18.tar.gz
Modified: 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 2010-12-14 09:53:22 UTC (rev 11928)
+++ csw/mgar/pkg/xchm/trunk/files/0001-Fix-extra-comma-at-end-of-enum.patch 2010-12-14 11:05:24 UTC (rev 11929)
@@ -1,4 +1,4 @@
-From f327a8fe2df06b49bb7ad3dcec2f75108bea1e3c Mon Sep 17 00:00:00 2001
+From cde99f93f893fa6bbce5e0fb438ade41751b5bba 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
@@ -8,7 +8,7 @@
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/chmframe.h b/src/chmframe.h
-index 62a3f52..1dc59a1 100644
+index 7f00b9a..243eae7 100644
--- a/src/chmframe.h
+++ b/src/chmframe.h
@@ -79,7 +79,7 @@ enum
@@ -21,5 +21,5 @@
--
-1.6.5
+1.7.3.2
Modified: 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 2010-12-14 09:53:22 UTC (rev 11928)
+++ csw/mgar/pkg/xchm/trunk/files/0002-Remove-W-Wall-for-Sun-Studio.patch 2010-12-14 11:05:24 UTC (rev 11929)
@@ -1,18 +1,17 @@
-From 042ab4f6497309a3488d73538f816e9a88c851de Mon Sep 17 00:00:00 2001
+From b72c0a81f12d65bf31cc6bb1f0b041c0911489c9 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(-)
+ configure | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/configure b/configure
-index 50a3330..c5da2c9 100755
+index d77ba5b..eff7ff6 100755
--- a/configure
+++ b/configure
-@@ -5385,7 +5385,7 @@ wx_config_minor_version=`echo $WX_VERSION | \
+@@ -5475,7 +5475,7 @@ wx_config_minor_version=`echo $WX_VERSION | \
sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\2/'`
CPPFLAGS="$CPPFLAGS $WX_CPPFLAGS"
@@ -21,19 +20,6 @@
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
+1.7.3.2
Added: csw/mgar/pkg/xchm/trunk/files/0003-Use-inttypes-instead-of-stdint.patch
===================================================================
--- csw/mgar/pkg/xchm/trunk/files/0003-Use-inttypes-instead-of-stdint.patch (rev 0)
+++ csw/mgar/pkg/xchm/trunk/files/0003-Use-inttypes-instead-of-stdint.patch 2010-12-14 11:05:24 UTC (rev 11929)
@@ -0,0 +1,39 @@
+From f1eb5eeb4ad88dbc14b72c1e0d8483abec42013b Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen <dam at opencsw.org>
+Date: Tue, 14 Dec 2010 11:52:45 +0100
+Subject: [PATCH 3/3] Use inttypes instead of stdint
+
+---
+ 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 4f57290..838f8ec 100644
+--- a/src/chmfile.h
++++ b/src/chmfile.h
+@@ -28,7 +28,7 @@
+ # include <config.h>
+ #endif
+
+-#include <stdint.h>
++#include <inttypes.h>
+ #include <chm_lib.h>
+ #include <wx/filefn.h>
+ #include <wx/string.h>
+--
+1.7.3.2
+
Deleted: 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 2010-12-14 09:53:22 UTC (rev 11928)
+++ csw/mgar/pkg/xchm/trunk/files/0003-Use-inttypes.h-instead-of-stdint.h.patch 2010-12-14 11:05:24 UTC (rev 11929)
@@ -1,39 +0,0 @@
-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.