diff options
author | Jonathan Callen <abcd@gentoo.org> | 2009-11-09 10:47:25 +0000 |
---|---|---|
committer | Jonathan Callen <abcd@gentoo.org> | 2009-11-09 10:47:25 +0000 |
commit | 07ae45cdbb922fd2007d1314458c7e9ae7e10353 (patch) | |
tree | 9e6cf443bc82fb9bec828c3f9f0d36ec0040ee30 /dev-java | |
parent | Drop unneeded patch (diff) | |
download | gentoo-2-07ae45cdbb922fd2007d1314458c7e9ae7e10353.tar.gz gentoo-2-07ae45cdbb922fd2007d1314458c7e9ae7e10353.tar.bz2 gentoo-2-07ae45cdbb922fd2007d1314458c7e9ae7e10353.zip |
Drop unneeded patches
(Portage version: -svn/cvs/Linux i686)
Diffstat (limited to 'dev-java')
-rw-r--r-- | dev-java/qtjambi/ChangeLog | 8 | ||||
-rw-r--r-- | dev-java/qtjambi/files/generator-4.3.3.patch | 10 | ||||
-rw-r--r-- | dev-java/qtjambi/files/jambi.pri.diff | 12 | ||||
-rw-r--r-- | dev-java/qtjambi/files/java_files_remove_accessibility.diff | 20 | ||||
-rw-r--r-- | dev-java/qtjambi/files/java_files_remove_ssl.diff | 10 | ||||
-rw-r--r-- | dev-java/qtjambi/files/qtjambi_base.pri.diff | 11 |
6 files changed, 7 insertions, 64 deletions
diff --git a/dev-java/qtjambi/ChangeLog b/dev-java/qtjambi/ChangeLog index 2be0ff4bbcc5..1e1f4712e68a 100644 --- a/dev-java/qtjambi/ChangeLog +++ b/dev-java/qtjambi/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for dev-java/qtjambi # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/qtjambi/ChangeLog,v 1.20 2009/07/22 07:29:15 ali_bush Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/qtjambi/ChangeLog,v 1.21 2009/11/09 10:47:23 abcd Exp $ + + 09 Nov 2009; Jonathan Callen <abcd@gentoo.org> + -files/generator-4.3.3.patch, -files/jambi.pri.diff, + -files/java_files_remove_accessibility.diff, + -files/java_files_remove_ssl.diff, -files/qtjambi_base.pri.diff: + Drop unneeded patches 19 Jul 2009; Dominik Kapusta <d@ayoy.net> qtjambi-4.5.0_p1.ebuild, +files/gcc4.4-4.5.0_p1.patch, +metadata.xml: diff --git a/dev-java/qtjambi/files/generator-4.3.3.patch b/dev-java/qtjambi/files/generator-4.3.3.patch deleted file mode 100644 index 2557b0bc0e3d..000000000000 --- a/dev-java/qtjambi/files/generator-4.3.3.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- generator/main.h.orig 2007-10-23 08:03:37.000000000 -0400 -+++ generator/main.h 2007-10-23 08:03:42.000000000 -0400 -@@ -74,7 +74,6 @@ - if (qtdir.isEmpty()) { - qWarning("QTDIR environment variable not set. This may cause problems with finding the necessary include files."); - } else { -- qtdir += "/include"; - includes << (qtdir + "/QtXml"); - includes << (qtdir + "/QtNetwork"); - includes << (qtdir + "/QtCore"); diff --git a/dev-java/qtjambi/files/jambi.pri.diff b/dev-java/qtjambi/files/jambi.pri.diff deleted file mode 100644 index 39e6e930f46f..000000000000 --- a/dev-java/qtjambi/files/jambi.pri.diff +++ /dev/null @@ -1,12 +0,0 @@ ---- designer-integration/pri/jambi.pri.orig 2007-06-07 11:20:45.000000000 -0400 -+++ designer-integration/pri/jambi.pri 2007-06-07 11:20:54.000000000 -0400 -@@ -19,6 +19,9 @@ - } - } - -+CONFIG-=debug -+CONFIG+=release -+ - contains(QT_CONFIG, release):contains(QT_CONFIG, debug) { - # Qt was configued with both debug and release libs - CONFIG += debug_and_release build_all diff --git a/dev-java/qtjambi/files/java_files_remove_accessibility.diff b/dev-java/qtjambi/files/java_files_remove_accessibility.diff deleted file mode 100644 index a2132e8f4c12..000000000000 --- a/dev-java/qtjambi/files/java_files_remove_accessibility.diff +++ /dev/null @@ -1,20 +0,0 @@ ---- java_files.orig 2007-06-07 11:30:22.000000000 -0400 -+++ java_files 2007-06-07 11:30:30.000000000 -0400 -@@ -186,17 +186,6 @@ - ./com/trolltech/qt/gui/QAbstractTextDocumentLayout.java - ./com/trolltech/qt/gui/QAbstractTextDocumentLayout_PaintContext.java - ./com/trolltech/qt/gui/QAbstractTextDocumentLayout_Selection.java --./com/trolltech/qt/gui/QAccessible.java --./com/trolltech/qt/gui/QAccessible2Interface.java --./com/trolltech/qt/gui/QAccessibleBridge.java --./com/trolltech/qt/gui/QAccessibleEvent.java --./com/trolltech/qt/gui/QAccessibleInterface.java --./com/trolltech/qt/gui/QAccessibleInterfaceEx.java --./com/trolltech/qt/gui/QAccessibleObject.java --./com/trolltech/qt/gui/QAccessibleObjectEx.java --./com/trolltech/qt/gui/QAccessibleTableInterface.java --./com/trolltech/qt/gui/QAccessibleWidget.java --./com/trolltech/qt/gui/QAccessibleWidgetEx.java - ./com/trolltech/qt/gui/QAction.java - ./com/trolltech/qt/gui/QActionEvent.java - ./com/trolltech/qt/gui/QActionGroup.java diff --git a/dev-java/qtjambi/files/java_files_remove_ssl.diff b/dev-java/qtjambi/files/java_files_remove_ssl.diff deleted file mode 100644 index f8569b864734..000000000000 --- a/dev-java/qtjambi/files/java_files_remove_ssl.diff +++ /dev/null @@ -1,10 +0,0 @@ ---- java_files.orig 2007-06-07 12:24:18.000000000 -0400 -+++ java_files 2007-06-07 12:24:22.000000000 -0400 -@@ -498,7 +498,6 @@ - ./com/trolltech/qt/network/QNetworkAddressEntry.java - ./com/trolltech/qt/network/QNetworkInterface.java - ./com/trolltech/qt/network/QNetworkProxy.java --./com/trolltech/qt/network/QSsl.java - ./com/trolltech/qt/network/QTcpServer.java - ./com/trolltech/qt/network/QTcpSocket.java - ./com/trolltech/qt/network/QUdpSocket.java diff --git a/dev-java/qtjambi/files/qtjambi_base.pri.diff b/dev-java/qtjambi/files/qtjambi_base.pri.diff deleted file mode 100644 index a6d197026cf6..000000000000 --- a/dev-java/qtjambi/files/qtjambi_base.pri.diff +++ /dev/null @@ -1,11 +0,0 @@ ---- qtjambi/qtjambi_base.pri.orig 2007-06-07 10:12:14.000000000 -0400 -+++ qtjambi/qtjambi_base.pri 2007-06-07 10:12:24.000000000 -0400 -@@ -10,6 +10,8 @@ - DESTDIR = $$PWD/../lib - DLLDESTDIR = $$PWD/../bin - -+CONFIG-=debug -+CONFIG+=release - - CONFIG(debug, debug|release) { - TARGET = $$member(TARGET, 0)_debuglib |