summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTomas Chvatal <scarabeus@gentoo.org>2011-04-28 21:16:16 +0000
committerTomas Chvatal <scarabeus@gentoo.org>2011-04-28 21:16:16 +0000
commit7ba59cc79b1dd1bfad8170367bf4cc9362629e2e (patch)
tree60abf0693f380fea442d51e24ca70365d9dadd2c /kde-misc
parentfix build with ffmpeg/libav latest git (diff)
downloadgentoo-2-7ba59cc79b1dd1bfad8170367bf4cc9362629e2e.tar.gz
gentoo-2-7ba59cc79b1dd1bfad8170367bf4cc9362629e2e.tar.bz2
gentoo-2-7ba59cc79b1dd1bfad8170367bf4cc9362629e2e.zip
Fix that thing so it actualy builds.
(Portage version: 2.2.0_alpha30/cvs/Linux x86_64)
Diffstat (limited to 'kde-misc')
-rw-r--r--kde-misc/qtrans/ChangeLog7
-rw-r--r--kde-misc/qtrans/files/0.2.2.6-define_return.patch12
-rw-r--r--kde-misc/qtrans/files/0.2.2.6-do_not_install_files.patch11
-rw-r--r--kde-misc/qtrans/qtrans-0.2.2.6.ebuild10
4 files changed, 34 insertions, 6 deletions
diff --git a/kde-misc/qtrans/ChangeLog b/kde-misc/qtrans/ChangeLog
index dcab739c99d3..6bcb93b50201 100644
--- a/kde-misc/qtrans/ChangeLog
+++ b/kde-misc/qtrans/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for kde-misc/qtrans
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-misc/qtrans/ChangeLog,v 1.5 2011/01/31 06:25:39 tampakrap Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/qtrans/ChangeLog,v 1.6 2011/04/28 21:16:16 scarabeus Exp $
+
+ 28 Apr 2011; Tomáš Chvátal <scarabeus@gentoo.org>
+ +files/0.2.2.6-define_return.patch,
+ +files/0.2.2.6-do_not_install_files.patch, qtrans-0.2.2.6.ebuild:
+ Fix that thing so it actualy builds.
31 Jan 2011; Theo Chatzimichos <tampakrap@gentoo.org> -qtrans-0.2.2.2.ebuild,
qtrans-0.2.2.6.ebuild:
diff --git a/kde-misc/qtrans/files/0.2.2.6-define_return.patch b/kde-misc/qtrans/files/0.2.2.6-define_return.patch
new file mode 100644
index 000000000000..2e66a4dfacf6
--- /dev/null
+++ b/kde-misc/qtrans/files/0.2.2.6-define_return.patch
@@ -0,0 +1,12 @@
+diff -urN qtrans-0.2.2.6.old/src/plugins/stardict/stardict.cpp qtrans-0.2.2.6/src/plugins/stardict/stardict.cpp
+--- qtrans-0.2.2.6.old/src/plugins/stardict/stardict.cpp 2011-04-28 23:08:08.000000000 +0200
++++ qtrans-0.2.2.6/src/plugins/stardict/stardict.cpp 2011-04-28 23:11:33.000000000 +0200
+@@ -1123,7 +1123,7 @@
+
+ QString StarDict::parseData(const char *data)
+ {
+-
++ return "Not implemented";
+ }
+
+
diff --git a/kde-misc/qtrans/files/0.2.2.6-do_not_install_files.patch b/kde-misc/qtrans/files/0.2.2.6-do_not_install_files.patch
new file mode 100644
index 000000000000..d3324c96c4e3
--- /dev/null
+++ b/kde-misc/qtrans/files/0.2.2.6-do_not_install_files.patch
@@ -0,0 +1,11 @@
+--- qtrans-0.2.2.6.old/CMakeLists.txt 2011-04-28 23:08:08.000000000 +0200
++++ qtrans-0.2.2.6/CMakeLists.txt 2011-04-28 23:12:47.000000000 +0200
+@@ -23,8 +23,3 @@
+ add_subdirectory(src)
+ add_subdirectory(flags)
+ add_subdirectory(icons)
+-
+-########### install files ###############
+-
+-INSTALL(FILES README DESTINATION share/apps/qtrans/)
+-INSTALL(FILES ChangeLog DESTINATION share/apps/qtrans/)
diff --git a/kde-misc/qtrans/qtrans-0.2.2.6.ebuild b/kde-misc/qtrans/qtrans-0.2.2.6.ebuild
index 98c6fba8aa08..e354b8750a37 100644
--- a/kde-misc/qtrans/qtrans-0.2.2.6.ebuild
+++ b/kde-misc/qtrans/qtrans-0.2.2.6.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-misc/qtrans/qtrans-0.2.2.6.ebuild,v 1.2 2011/01/31 06:25:39 tampakrap Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/qtrans/qtrans-0.2.2.6.ebuild,v 1.3 2011/04/28 21:16:16 scarabeus Exp $
EAPI=3
WEBKIT_REQUIRED=always
@@ -17,7 +17,7 @@ IUSE="debug"
DOCS=( ChangeLog README )
-src_install() {
- kde4-base_src_install
- rm -f "${ED}"usr/share/apps/qtrans/{ChangeLog,README}
-}
+PATCHES=(
+ "${FILESDIR}/${PV}-define_return.patch"
+ "${FILESDIR}/${PV}-do_not_install_files.patch"
+)