summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDiego Elio Pettenò <flameeyes@gentoo.org>2007-02-05 11:55:30 +0000
committerDiego Elio Pettenò <flameeyes@gentoo.org>2007-02-05 11:55:30 +0000
commitc3ae968acc6bd37b999f6c5e304557c550fe5931 (patch)
treed774bbc7cd5e31e72b2dc2fcf58cef5d84a3bd0d /kde-base/kooka
parentNew version for translation updates (diff)
downloadgentoo-2-c3ae968acc6bd37b999f6c5e304557c550fe5931.tar.gz
gentoo-2-c3ae968acc6bd37b999f6c5e304557c550fe5931.tar.bz2
gentoo-2-c3ae968acc6bd37b999f6c5e304557c550fe5931.zip
Remove unneeded patches.
(Portage version: 2.1.2-r7)
Diffstat (limited to 'kde-base/kooka')
-rw-r--r--kde-base/kooka/ChangeLog7
-rw-r--r--kde-base/kooka/files/configure-fix-kdegraphics-kadmos.patch47
-rw-r--r--kde-base/kooka/files/kdegraphics-3.4.1-gocr.patch14
3 files changed, 6 insertions, 62 deletions
diff --git a/kde-base/kooka/ChangeLog b/kde-base/kooka/ChangeLog
index d5955f62edd1..3442fd8d43a6 100644
--- a/kde-base/kooka/ChangeLog
+++ b/kde-base/kooka/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for kde-base/kooka
# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kooka/ChangeLog,v 1.64 2007/02/04 02:45:58 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kooka/ChangeLog,v 1.65 2007/02/05 11:55:30 flameeyes Exp $
+
+ 05 Feb 2007; Diego Pettenò <flameeyes@gentoo.org>
+ -files/kdegraphics-3.4.1-gocr.patch,
+ -files/configure-fix-kdegraphics-kadmos.patch:
+ Remove unneeded patches.
04 Feb 2007; Diego Pettenò <flameeyes@gentoo.org> -kooka-3.5.2.ebuild:
Remove old versions.
diff --git a/kde-base/kooka/files/configure-fix-kdegraphics-kadmos.patch b/kde-base/kooka/files/configure-fix-kdegraphics-kadmos.patch
deleted file mode 100644
index 1f0334b99ef9..000000000000
--- a/kde-base/kooka/files/configure-fix-kdegraphics-kadmos.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-Index: kooka/configure.in.in
-===================================================================
---- kooka/configure.in.in (revision 428265)
-+++ kooka/configure.in.in (working copy)
-@@ -2,21 +2,32 @@
- dnl AC_CHECK_LIB(Pgm2asc,pgm2asc)
- dnl should define HAVE_LIBPGM2ASC if available
-
--AC_ARG_WITH(kadmos-dir,
--AC_HELP_STRING([--with-kadmos-dir],[sets the path to the kadmos engine]),
-- [ac_kadmos_value=$withval], [ac_kadmos_value=NONE])
-+AC_ARG_WITH([kadmos],
-+ [AS_HELP_STRING([--with-kadmos],
-+ [Enable the kadmos OCR engine @<:@default=check@:>@])],
-+ [], with_kadmos=check)
-
-+AC_ARG_WITH([kadmos-dir],
-+ AS_HELP_STRING([--with-kadmos-dir],
-+ [sets the path to the kadmos engine @<:@default=/usr/local@:>@]),
-+ [ac_kadmos_value=$withval], [ac_kadmos_value=/usr/local])
-+
- KADMOS_INC=
- KADMOS_LIB=
-
--if test -r "$ac_kadmos_value/kadmos.h"; then
-- KADMOS_INC="-I$ac_kadmos_value"
-- KADMOS_LIB="$ac_kadmos_value/librep.a"
-- AC_DEFINE_UNQUOTED(HAVE_KADMOS, 1, [Defines if your system has the kadmos libraries])
--elif test ! "x$ac_kadmos_value" = "xNONE"; then
-- AC_MSG_WARN([couldn't find kadmos engine header file under $ac_kadmos_value/kadmos.h])
-+if test "x$with_kadmos" != xno; then
-+ if test -r "$ac_kadmos_value/kadmos.h"; then
-+ KADMOS_INC="-I$ac_kadmos_value"
-+ KADMOS_LIB="$ac_kadmos_value/librep.a"
-+ AC_DEFINE_UNQUOTED(HAVE_KADMOS, 1, [Defines if your system has the kadmos libraries])
-+ else
-+ AC_MSG_WARN([couldn't find kadmos engine header file under $ac_kadmos_value/kadmos.h])
-+ fi
-+
-+ if test "x$with_kadmos" != xcheck && test -z "$KADMOS_LIB"; then
-+ AC_MSG_FAILURE([--with-kadmos was given, but test for kadmos failed])
-+ fi
- fi
-
- AC_SUBST(KADMOS_LIB)
- AC_SUBST(KADMOS_INC)
--
diff --git a/kde-base/kooka/files/kdegraphics-3.4.1-gocr.patch b/kde-base/kooka/files/kdegraphics-3.4.1-gocr.patch
deleted file mode 100644
index 1edb6b89bf9a..000000000000
--- a/kde-base/kooka/files/kdegraphics-3.4.1-gocr.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -Nur kdegraphics-3.4.1.orig/kooka/ksaneocr.cpp kdegraphics-3.4.1/kooka/ksaneocr.cpp
---- kdegraphics-3.4.1.orig/kooka/ksaneocr.cpp 2005-05-23 14:05:50.000000000 +0200
-+++ kdegraphics-3.4.1/kooka/ksaneocr.cpp 2005-05-31 18:31:43.000000000 +0200
-@@ -108,6 +108,10 @@
- {
- m_ocrEngine = OCRAD;
- }
-+ else if( eng == "gocr" )
-+ {
-+ m_ocrEngine = GOCR;
-+ }
-
- #ifdef HAVE_KADMOS
- else if( eng == QString("kadmos") ) m_ocrEngine = KADMOS;