From 8e79dd42165e47a0da23d30663417c0f17d2873c Mon Sep 17 00:00:00 2001 From: Ondrej Sukup Date: Tue, 22 Sep 2009 19:08:05 +0200 Subject: [PATCH] remove unneded files , small change in ebuild --- dev-db/tora/Manifest | 5 +--- dev-db/tora/files/gcc41.patch | 11 --------- dev-db/tora/files/tora-2.0.0-gcc44.patch | 40 -------------------------------- dev-db/tora/files/tora-gcc43.patch | 11 --------- dev-db/tora/tora-2.1.0-r1.ebuild | 2 +- 5 files changed, 2 insertions(+), 67 deletions(-) delete mode 100644 dev-db/tora/files/gcc41.patch delete mode 100644 dev-db/tora/files/tora-2.0.0-gcc44.patch delete mode 100644 dev-db/tora/files/tora-gcc43.patch diff --git a/dev-db/tora/Manifest b/dev-db/tora/Manifest index 2e4cb79..11627ad 100644 --- a/dev-db/tora/Manifest +++ b/dev-db/tora/Manifest @@ -1,9 +1,6 @@ -AUX gcc41.patch 438 RMD160 5ba95db43198d2ca79aa66fcf8b1f1719ca30fd5 SHA1 bcdaee7a567bc42c42625943792f3c817db188d9 SHA256 bceeefe86bd8ecf5d2194de6c5aff66f7103ef295ae2e247eedde57e91bfb21d -AUX tora-2.0.0-gcc44.patch 1077 RMD160 76407025786717cc51227f5fbb0fe89924d0637c SHA1 ed8d896c763c78ea799c0553f19ab11e646bd0ef SHA256 e1f0a90cba79fcd5a6b486e50357e2641ebef248807e9d893287021c8f54effb -AUX tora-gcc43.patch 304 RMD160 86bd8f66d392671667409674c0788aad1d67e52f SHA1 74367200e2739e0d4336a69d0fcdbc0424141536 SHA256 a551a1ba43fe48027bc4cc8d721c8645c40a530f0dbf6686cd0dc91e5e04c0b9 AUX tora.desktop 267 RMD160 489ca7e384df925ed00842b405a8a8449f247d13 SHA1 497070e2b7e6f282ea82f5d625088678f706c68b SHA256 601dd498ffd8c26dbc02abb6cfba714d62863462000d6db867a7925446f4ad2f AUX tora.png 1227 RMD160 92904c3d0026829ceabf5acd86bce3c340fb8494 SHA1 bf8b89970377bace9f432b9dd56b16ef82f332fe SHA256 d218247bc2eb885a3783ab8b6f4f3f456df4b812d21b093f9b007da405f8068a DIST tora-2.1.0.tar.gz 4718857 RMD160 a5e5f8119fb46f3639eb1afcf1f397e2a8b2cdb5 SHA1 d8e40ee0dc0eb740737352d669c46ebdf924a9f4 SHA256 f3fc1c07d309f79b267ed562fc1a7786717ec3e17d43120f0a33d246f0486a1f -EBUILD tora-2.1.0-r1.ebuild 1998 RMD160 b84b27a9a3e32830154b2eefa8d0d3fd9f423cf0 SHA1 3d6f14a3c79c069242a865d6838bbc128ff84192 SHA256 8f8cbcd898f4ef2acf34e81369ac5fb08e25d3b2966a826100064ac92fc420c2 +EBUILD tora-2.1.0-r1.ebuild 1960 RMD160 02e42e684d932048a52561ed6660c0cc7237a52f SHA1 9c0cc8bafd494e844475e40d369de06a5668e677 SHA256 e92bd9be45218faeb96da9d1d2a6b0cdf3bab4bf669617f538fbac2501f03818 MISC ChangeLog 10845 RMD160 1804d3285774f2d5095dfeeb35d7d2a1e408fa92 SHA1 c9cb741271d80d5f8d96562878d6210fe62b9853 SHA256 23930d9304e29607086416b7c052325acc6c854ba5005b7b05cd7cd12cc2084c MISC metadata.xml 545 RMD160 c8a0b509c95d54228308ab8016ca36f36cde8b78 SHA1 992a140bc0b64afcbd46a3feaff6a4adf85fea3b SHA256 99c153750d77644b1e959d2dba6d413fd23fdc4f4d55ea04e5d283f43aae6f95 diff --git a/dev-db/tora/files/gcc41.patch b/dev-db/tora/files/gcc41.patch deleted file mode 100644 index a205dd2..0000000 --- a/dev-db/tora/files/gcc41.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- tora-1.3.21/tothread.cpp.wiget 2006-05-22 16:29:32.000000000 +0200 -+++ tora-1.3.21/tothread.cpp 2006-05-22 16:31:40.000000000 +0200 -@@ -156,6 +156,8 @@ - #define THREAD_ASSERT(x) if((x)!=0) { \ - throw (qApp->translate("toThread","Thread function \"%1\" failed.").arg(QString::fromLatin1( #x ))); } - -+void *toThreadStartWrapper(void *t); -+ - void toThread::initAttr() - { - //create the thread detached, so everything is cleaned up diff --git a/dev-db/tora/files/tora-2.0.0-gcc44.patch b/dev-db/tora/files/tora-2.0.0-gcc44.patch deleted file mode 100644 index 468e37a..0000000 --- a/dev-db/tora/files/tora-2.0.0-gcc44.patch +++ /dev/null @@ -1,40 +0,0 @@ ---- src/toqvalue.cpp.orig 2009-06-25 21:56:21.879870369 +0200 -+++ src/toqvalue.cpp 2009-06-25 21:56:35.759867041 +0200 -@@ -44,6 +44,7 @@ - #include "toconf.h" - #include "toqvalue.h" - -+#include - #include - #include - ---- src/tomodeleditor.cpp.orig 2009-06-25 21:59:49.922104810 +0200 -+++ src/tomodeleditor.cpp 2009-06-25 21:59:59.904863047 +0200 -@@ -48,6 +48,7 @@ - #include "toresultview.h" - #include "tomain.h" - -+#include - #include - #include - #include ---- src/toresultview.cpp.orig 2009-06-25 22:01:53.095862952 +0200 -+++ src/toresultview.cpp 2009-06-25 22:02:06.038862175 +0200 -@@ -54,6 +54,7 @@ - #include "totool.h" - #include "toresultlistformat.h" - -+#include - #include - #include - #include ---- src/todebug.cpp.orig 2009-06-25 22:31:27.233110649 +0200 -+++ src/todebug.cpp 2009-06-25 22:31:41.032862675 +0200 -@@ -58,6 +58,7 @@ - #include "totool.h" - #include "tocodemodel.h" - -+#include - #include - - #include diff --git a/dev-db/tora/files/tora-gcc43.patch b/dev-db/tora/files/tora-gcc43.patch deleted file mode 100644 index b39b94d..0000000 --- a/dev-db/tora/files/tora-gcc43.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- ext/loki/loki-0.1.6/src/SmallObj.cpp.orig 2008-06-16 20:10:07.676442069 +0200 -+++ ext/loki/loki-0.1.6/src/SmallObj.cpp 2008-06-16 20:10:21.139446807 +0200 -@@ -22,6 +22,8 @@ - #include - #include - -+#include -+ - //#define DO_EXTRA_LOKI_TESTS - //#define USE_NEW_TO_ALLOCATE - diff --git a/dev-db/tora/tora-2.1.0-r1.ebuild b/dev-db/tora/tora-2.1.0-r1.ebuild index b2d6e6c..79eb944 100644 --- a/dev-db/tora/tora-2.1.0-r1.ebuild +++ b/dev-db/tora/tora-2.1.0-r1.ebuild @@ -39,7 +39,7 @@ pkg_setup() { src_configure() { local myconf - myconf="--with-qt-libraries=/usr/$(get_libdir)/qt4 --with-qt-includes=/usr/include/qt4/ --with-qt-dir=/usr/$(get_libdir)/qt4/" + myconf="--with-qt-libraries=/usr/$(get_libdir)/qt4 --with-qt-includes=/usr/include/qt4/" use debug && myconf="$myconf --enable-debug" use oracle && myconf="$myconf --with-oracle=${ORACLE_HOME}" use oci8-instant-client && myconf="$myconf --with-instant-client=${ORACLE_HOME}" -- 2.11.4.GIT