From 81193706f4a157d5b02be888bade5566fd8f1326 Mon Sep 17 00:00:00 2001 From: Gregorio Guidi Date: Thu, 9 Jun 2005 12:48:33 +0000 Subject: New version. Fixes access violations (#95459). (Portage version: 2.0.51.19) --- app-doc/kchmviewer/ChangeLog | 8 ++- app-doc/kchmviewer/files/digest-kchmviewer-0.9 | 1 + app-doc/kchmviewer/files/kchmviewer-0.9-pic.patch | 65 +++++++++++++++++++++++ app-doc/kchmviewer/kchmviewer-0.9.ebuild | 47 ++++++++++++++++ 4 files changed, 120 insertions(+), 1 deletion(-) create mode 100644 app-doc/kchmviewer/files/digest-kchmviewer-0.9 create mode 100644 app-doc/kchmviewer/files/kchmviewer-0.9-pic.patch create mode 100644 app-doc/kchmviewer/kchmviewer-0.9.ebuild (limited to 'app-doc') diff --git a/app-doc/kchmviewer/ChangeLog b/app-doc/kchmviewer/ChangeLog index ac4694efdd29..77848a1aa73e 100644 --- a/app-doc/kchmviewer/ChangeLog +++ b/app-doc/kchmviewer/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for app-doc/kchmviewer # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-doc/kchmviewer/ChangeLog,v 1.1 2005/06/06 06:16:31 centic Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-doc/kchmviewer/ChangeLog,v 1.2 2005/06/09 12:48:33 greg_g Exp $ + +*kchmviewer-0.9 (09 Jun 2005) + + 09 Jun 2005; Gregorio Guidi + +files/kchmviewer-0.9-pic.patch, +kchmviewer-0.9.ebuild: + New version. Fixes access violations (#95459). 06 Jun 2005; Dominik Stadler ChangeLog: New package, fixes Bug 91193 diff --git a/app-doc/kchmviewer/files/digest-kchmviewer-0.9 b/app-doc/kchmviewer/files/digest-kchmviewer-0.9 new file mode 100644 index 000000000000..74321ee8d3cb --- /dev/null +++ b/app-doc/kchmviewer/files/digest-kchmviewer-0.9 @@ -0,0 +1 @@ +MD5 b22807dd9dea954bf1a7a06d878582b5 kchmviewer-0.9.tar.gz 559634 diff --git a/app-doc/kchmviewer/files/kchmviewer-0.9-pic.patch b/app-doc/kchmviewer/files/kchmviewer-0.9-pic.patch new file mode 100644 index 000000000000..5d3d17a0779a --- /dev/null +++ b/app-doc/kchmviewer/files/kchmviewer-0.9-pic.patch @@ -0,0 +1,65 @@ +diff -Nur kchmviewer-0.9.orig/chmlib-0.35/Makefile.am kchmviewer-0.9/chmlib-0.35/Makefile.am +--- kchmviewer-0.9.orig/chmlib-0.35/Makefile.am 2005-05-04 15:42:10.000000000 +0200 ++++ kchmviewer-0.9/chmlib-0.35/Makefile.am 2005-06-08 18:22:51.000000000 +0200 +@@ -1,4 +1,4 @@ +-noinst_LIBRARIES = libchm.a ++noinst_LTLIBRARIES = libchm.la + noinst_HEADERS = chm_lib.h lzx.h + +-libchm_a_SOURCES = chm_lib.c lzx.c ++libchm_la_SOURCES = chm_lib.c lzx.c +diff -Nur kchmviewer-0.9.orig/configure.ac kchmviewer-0.9/configure.ac +--- kchmviewer-0.9.orig/configure.ac 2005-06-07 11:11:43.000000000 +0200 ++++ kchmviewer-0.9/configure.ac 2005-06-08 18:32:05.000000000 +0200 +@@ -31,9 +31,7 @@ + EXTRA_SUBDIRS="" + CHMLIBDIR="chmlib-0.35" + CHM_INCLUDES="\$(top_srcdir)/$CHMLIBDIR/" +-CHM_LIBS="\$(top_builddir)/$CHMLIBDIR/libchm.a" +- +-LIBS="$LIBS $CHM_LIBS" ++CHM_LIBS="\$(top_builddir)/$CHMLIBDIR/libchm.la" + + AC_ARG_WITH(kde, AC_HELP_STRING([--with-kde],[enable KDE support])) + +@@ -45,13 +43,14 @@ + EXTRA_SUBDIRS="$EXTRA_SUBDIRS kio-msits" + fi + +-if test "x$with_kde" = "x"; then ++if test "x$with_kde" != "xyes"; then + include_ARTS_FALSE="yes" + AC_PREFIX_DEFAULT(${prefix:-/usr/local}) + fi + + AC_SUBST(EXTRA_SUBDIRS) + AC_SUBST(CHM_INCLUDES) ++AC_SUBST(CHM_LIBS) + + AC_OUTPUT(src/Makefile Makefile kio-msits/Makefile chmlib-0.35/Makefile) + +diff -Nur kchmviewer-0.9.orig/kio-msits/Makefile.am kchmviewer-0.9/kio-msits/Makefile.am +--- kchmviewer-0.9.orig/kio-msits/Makefile.am 2005-05-05 09:09:12.000000000 +0200 ++++ kchmviewer-0.9/kio-msits/Makefile.am 2005-06-08 18:24:22.000000000 +0200 +@@ -4,7 +4,7 @@ + kde_module_LTLIBRARIES = kio_msits.la + + kio_msits_la_SOURCES = msits.cpp +-kio_msits_la_LIBADD = -lkio ++kio_msits_la_LIBADD = -lkio $(CHM_LIBS) + kio_msits_la_LDFLAGS = -module -avoid-version $(QT_LIBS) $(KDE_LDFLAGS) $(KDE_LIBS) $(KDE_PLUGIN) + + protocol_DATA = msits.protocol +diff -Nur kchmviewer-0.9.orig/src/Makefile.am kchmviewer-0.9/src/Makefile.am +--- kchmviewer-0.9.orig/src/Makefile.am 2005-05-10 18:31:34.000000000 +0200 ++++ kchmviewer-0.9/src/Makefile.am 2005-06-08 18:24:26.000000000 +0200 +@@ -10,7 +10,8 @@ + INCLUDES = $(QT_INCLUDES) -I$(CHM_INCLUDES) $(KDE_INCLUDES) + + # the library search path. +-kchmviewer_LDFLAGS = $(QT_LDFLAGS) $(LIB_QT) $(KDE_LDFLAGS) $(LIB_KDEUI) $(LIB_KHTML) ++kchmviewer_LDADD = $(CHM_LIBS) $(LIB_QT) $(LIB_KDEUI) $(LIB_KHTML) ++kchmviewer_LDFLAGS = $(QT_LDFLAGS) $(KDE_LDFLAGS) + + #LIB_KDEPRINT = -lkdeprint + #LIB_KDEUI = -lkdeui diff --git a/app-doc/kchmviewer/kchmviewer-0.9.ebuild b/app-doc/kchmviewer/kchmviewer-0.9.ebuild new file mode 100644 index 000000000000..0878388ffa6c --- /dev/null +++ b/app-doc/kchmviewer/kchmviewer-0.9.ebuild @@ -0,0 +1,47 @@ +# Copyright 1999-2005 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/app-doc/kchmviewer/kchmviewer-0.9.ebuild,v 1.1 2005/06/09 12:48:33 greg_g Exp $ + +inherit kde-functions eutils + +DESCRIPTION="Qt-based feature rich CHM file viewer." +HOMEPAGE="http://kchmviewer.sourceforge.net/" +SRC_URI="mirror://sourceforge/kchmviewer/${P}.tar.gz" +LICENSE="GPL-2" + +SLOT="0" +KEYWORDS="~x86" +IUSE="kde" + +RDEPEND="kde? ( kde-base/kdelibs )" + +DEPEND="${RDEPEND} + sys-devel/autoconf + sys-devel/automake" + +need-qt 3.3 + +src_unpack() { + unpack ${A} + cd ${S} + + # Fix PIC issue. Submitted upstream. + epatch "${FILESDIR}/${P}-pic.patch" + + # Regenerate configure for the pic patch. + einfo "Running autoreconf..." + autoreconf || die + perl am_edit || die +} + +src_compile() { + set-kdedir 3 + + econf $(use_with kde) || die + emake || die +} + +src_install() { + make DESTDIR="${D}" install || die + dodoc ChangeLog +} -- cgit v1.2.3-65-gdbad