summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonathan Callen <jcallen@gentoo.org>2009-11-09 10:47:25 +0000
committerJonathan Callen <jcallen@gentoo.org>2009-11-09 10:47:25 +0000
commit1fd9c8b93c6d2fb9e5bb82af623b6ffd725b2a6d (patch)
tree239fa18e408d1cbd9a67247de6b2cbcaf08d1681 /dev-java/qtjambi
parentDrop unneeded patch (diff)
downloadhistorical-1fd9c8b93c6d2fb9e5bb82af623b6ffd725b2a6d.tar.gz
historical-1fd9c8b93c6d2fb9e5bb82af623b6ffd725b2a6d.tar.bz2
historical-1fd9c8b93c6d2fb9e5bb82af623b6ffd725b2a6d.zip
Drop unneeded patches
Package-Manager: portage--svn/cvs/Linux i686
Diffstat (limited to 'dev-java/qtjambi')
-rw-r--r--dev-java/qtjambi/ChangeLog8
-rw-r--r--dev-java/qtjambi/Manifest7
-rw-r--r--dev-java/qtjambi/files/generator-4.3.3.patch10
-rw-r--r--dev-java/qtjambi/files/jambi.pri.diff12
-rw-r--r--dev-java/qtjambi/files/java_files_remove_accessibility.diff20
-rw-r--r--dev-java/qtjambi/files/java_files_remove_ssl.diff10
-rw-r--r--dev-java/qtjambi/files/qtjambi_base.pri.diff11
7 files changed, 8 insertions, 70 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/Manifest b/dev-java/qtjambi/Manifest
index d79d4c93bc20..8b9d9b810d88 100644
--- a/dev-java/qtjambi/Manifest
+++ b/dev-java/qtjambi/Manifest
@@ -1,16 +1,11 @@
AUX configuration-4.4.3.patch 4752 RMD160 51c1e090ac73794444767ce2bb0a873aca966da1 SHA1 5b82fa9d8e1a4837f1387cb4a2670469e38e6709 SHA256 c04b2e5e493448c0859096bba335bcacd164f4c2257bf6014e3902c9dce7e9c4
AUX configuration-4.5.0_p1.patch 3975 RMD160 4e3e32f4a9c02c977b3fe7416cb8e92ea48289dd SHA1 ab483d3122a5f98d10b321511de6794bd57f5885 SHA256 6fff370711c319a6e070569405172a27af039f1dcdd064d37bbfaf3261e5a0a5
AUX gcc4.4-4.5.0_p1.patch 1108 RMD160 b0b54f12d32fcc47a4c8846ad2183dcfd0efa3fd SHA1 4c834eb9795fb1e09bd8fe349cc05db4d4caa900 SHA256 eb6669bc0937a3147a4089c9de376b4fc783ff093340453d461fbf08216b0bfe
-AUX generator-4.3.3.patch 489 RMD160 a6b576b6198ca5623a55ee36c93cb6b913bc92ef SHA1 abc82c760d76b2f9632f1a5734ecde59f066632a SHA256 e73eae66273c052ab19fb1b475c166d84533451788d2e248b88d6aa87e244ad9
AUX generator-4.4.3.patch 435 RMD160 e04e68ec33a0984811a5038d1bf039739d27e7a0 SHA1 36d473e5a85ea36290aa73bfdac40e791fc3a4b3 SHA256 66b7eb929423a1b2d89d96ca1323c8742b38e4667633211fb0ed5d272273077d
AUX generator-4.5.0_p1.patch 1352 RMD160 cdec9732e2a7d5421451b8e7e3e60de1c195fdee SHA1 9bfdca02dc220508ebe7255f8aff9780c99ed824 SHA256 80adfa473b386bcec10b861ba76759b3554167e3a81108b5e8d2d5ffc04d1e57
-AUX jambi.pri.diff 378 RMD160 21d23395801cd0c0818fd9dd1efb09e53f746877 SHA1 ecc1f8333a966a90b5023e84aa0f0b69aa74790c SHA256 67fdf9d6199906dfdd769b73e1ebf281109de892b3b1a377d70c7746249b3b46
-AUX java_files_remove_accessibility.diff 977 RMD160 c3d7e199f41561d2d39a64143934fbde2cef38cc SHA1 a6b78e27d5c608a1d7eef6cfc943ecf9202c95ec SHA256 3e2cfb1d84c3d85f87d6bb9e585973d8a37c351d569ec081eeaf81e710146131
-AUX java_files_remove_ssl.diff 449 RMD160 0cf00a60176830b698fbbba51fb4dace5029bf53 SHA1 654221169dce14e3304515a4590855c070d643a2 SHA256 1bcf75cc5d175d16c8f55950e958a8a9214a1e86bcb36430334ab361e0085c5c
-AUX qtjambi_base.pri.diff 315 RMD160 3843aac6fe19d84f7b5f92040e73592fa477b79d SHA1 479a12fc5a1b932ee3c794086d5a3683502702b5 SHA256 04a90f77b9045309b187078163ee752f9f04298fba79751f0f129789964a5566
DIST qtjambi-src-gpl-4.4.3_01.tar.gz 4909835 RMD160 2d5b014e5fa3e012d84b2b2557b3332135ff11d1 SHA1 58c5b90eb16c82ff80626ee30d0fe0405cca6e71 SHA256 4a938ab1fb75a119ad61fa6d5a5bee813a0d95b9b93cf1a3383616c3a44f4531
DIST qtjambi-src-lgpl-4.5.0_01.tar.gz 4949615 RMD160 0590b536a9c7dd680e8730aa512c7935e07bbe46 SHA1 f1e6aa77f5b151fffe4d6d7a1ca468fa01c339f9 SHA256 2e136852e4314fbb1b64e08ad6f173bdf5ebdbdb62cb96de518b0a4e6a7dba2e
EBUILD qtjambi-4.4.3.ebuild 4281 RMD160 c81b515da1d70ed75a79ed92c295614af5760da2 SHA1 7257bedc82b374c0b7ae623ccd0f68fd8f13b662 SHA256 d44387e629441920add6bf6d105ad5582014f8ca0cceb419c717d3e71b86907c
EBUILD qtjambi-4.5.0_p1.ebuild 4955 RMD160 8ae814394e8ea07ec25ef6d139e445697996370c SHA1 ae675cf84e31863f1226f4fc2fff458d4ba26f7a SHA256 147dd845d4317a587b55c04657d7acd596096726bd3d8d584f45ba3b32a483cd
-MISC ChangeLog 3831 RMD160 88bc795122e5ebe153b0c7c9a5dda39e07e20d69 SHA1 ea9094786081df4a4a133f3640887b31651ce7c6 SHA256 2fb0591a111fa0a22126268f85fd85a7e36f7f68292192bf96bb2f44885f79b4
+MISC ChangeLog 4070 RMD160 cbd943ad9e47d8bb9d945a046f103a7fdc72385b SHA1 d1bacd1a78f20bf37f49884f5fa6ec8d921600be SHA256 159933e3b9d3eceee22c2a8992510131d460e982b1090c10367793d07c9fe8f7
MISC metadata.xml 374 RMD160 554c518b96dd5681f778395c1888891649e6ed55 SHA1 ae068aac6ddef644ebcd32899ec79e6bcc879282 SHA256 5e303995da64782af3b8e13149e0d4ba849fdd84c4967ac4a429b12e5a9ac50f
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