diff options
author | Don Seiler <rizzo@gentoo.org> | 2004-10-29 16:13:10 +0000 |
---|---|---|
committer | Don Seiler <rizzo@gentoo.org> | 2004-10-29 16:13:10 +0000 |
commit | 3f47492df773b8f97aba3db6379b187336b7cfbe (patch) | |
tree | e35578a06da7a85231c310a71fdef8cafe7ba765 /dev-db/tora | |
parent | Sync opengl-update deps in DEPEND and RDEPEND. (Manifest recommit) (diff) | |
download | gentoo-2-3f47492df773b8f97aba3db6379b187336b7cfbe.tar.gz gentoo-2-3f47492df773b8f97aba3db6379b187336b7cfbe.tar.bz2 gentoo-2-3f47492df773b8f97aba3db6379b187336b7cfbe.zip |
New revision with some patches for triggers and invalid objects. Pruning old versions
Diffstat (limited to 'dev-db/tora')
-rw-r--r-- | dev-db/tora/ChangeLog | 11 | ||||
-rw-r--r-- | dev-db/tora/Manifest | 5 | ||||
-rw-r--r-- | dev-db/tora/files/digest-tora-1.3.13 | 1 | ||||
-rw-r--r-- | dev-db/tora/files/digest-tora-1.3.14.1-r1 (renamed from dev-db/tora/files/digest-tora-1.3.14.1) | 0 | ||||
-rw-r--r-- | dev-db/tora/files/tora-1.3.14.1-invalidobjects.diff | 148 | ||||
-rw-r--r-- | dev-db/tora/files/tora-1.3.14.1-race.patch | 24 | ||||
-rw-r--r-- | dev-db/tora/files/tora-1.3.14.1-triggers.diff | 11 | ||||
-rw-r--r-- | dev-db/tora/tora-1.3.13.ebuild | 60 | ||||
-rw-r--r-- | dev-db/tora/tora-1.3.14.1-r1.ebuild (renamed from dev-db/tora/tora-1.3.14.1.ebuild) | 19 |
9 files changed, 214 insertions, 65 deletions
diff --git a/dev-db/tora/ChangeLog b/dev-db/tora/ChangeLog index 5b027bd5cbef..3fc0f5639412 100644 --- a/dev-db/tora/ChangeLog +++ b/dev-db/tora/ChangeLog @@ -1,6 +1,15 @@ # ChangeLog for dev-db/tora # Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-db/tora/ChangeLog,v 1.31 2004/10/21 23:40:43 mr_bones_ Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-db/tora/ChangeLog,v 1.32 2004/10/29 16:13:09 rizzo Exp $ + +*tora-1.3.14.1-r1 (29 Oct 2004) + + 29 Oct 2004; Don Seiler <rizzo@gentoo.org> + +files/tora-1.3.14.1-invalidobjects.diff, +files/tora-1.3.14.1-race.patch, + +files/tora-1.3.14.1-triggers.diff, -tora-1.3.13.ebuild, + +tora-1.3.14.1-r1.ebuild, -tora-1.3.14.1.ebuild: + New revision with some patches for triggers and invalid objects. Pruning old + versions 21 Oct 2004; Michael Sterrett <mr_bones_@gentoo.org> tora-1.3.13.ebuild, tora-1.3.14.1.ebuild: diff --git a/dev-db/tora/Manifest b/dev-db/tora/Manifest index ebc77f9fa87a..84e9a35077c5 100644 --- a/dev-db/tora/Manifest +++ b/dev-db/tora/Manifest @@ -1,6 +1,11 @@ MD5 1e052afafd26d409ce27c031f09ba53c ChangeLog 4444 MD5 bda8803c4adc9cf0b308b71157891f05 metadata.xml 536 +MD5 a70fba225ffba0faae129afea32d59ef tora-1.3.14.1-r1.ebuild 2026 MD5 7fd708c96447ecdf4f2f3522018ab3cc tora-1.3.13.ebuild 1541 MD5 131d327ec858482ee6fc3531a5106390 tora-1.3.14.1.ebuild 1553 MD5 6e56617a37ef8382d8eda0609b63ea02 files/digest-tora-1.3.13 70 +MD5 4d38ba570ff115b02bfc9e2937fc0c84 files/tora-1.3.14.1-triggers.diff 449 MD5 e937ff9aa1c78b74db75186de6f51759 files/digest-tora-1.3.14.1 72 +MD5 a8088380e7c371c2f61aabbca96f4152 files/tora-1.3.14.1-invalidobjects.diff 4831 +MD5 44bd6caa730b70fb9f4c0eba267d5688 files/tora-1.3.14.1-race.patch 680 +MD5 e937ff9aa1c78b74db75186de6f51759 files/digest-tora-1.3.14.1-r1 72 diff --git a/dev-db/tora/files/digest-tora-1.3.13 b/dev-db/tora/files/digest-tora-1.3.13 deleted file mode 100644 index 3f048e6facc5..000000000000 --- a/dev-db/tora/files/digest-tora-1.3.13 +++ /dev/null @@ -1 +0,0 @@ -MD5 6dc6b22ad58e7baf6673e0f2e69b59ef tora-alpha-1.3.13.tar.gz 2487208 diff --git a/dev-db/tora/files/digest-tora-1.3.14.1 b/dev-db/tora/files/digest-tora-1.3.14.1-r1 index 096b8ef34c0b..096b8ef34c0b 100644 --- a/dev-db/tora/files/digest-tora-1.3.14.1 +++ b/dev-db/tora/files/digest-tora-1.3.14.1-r1 diff --git a/dev-db/tora/files/tora-1.3.14.1-invalidobjects.diff b/dev-db/tora/files/tora-1.3.14.1-invalidobjects.diff new file mode 100644 index 000000000000..3a835c64c202 --- /dev/null +++ b/dev-db/tora/files/tora-1.3.14.1-invalidobjects.diff @@ -0,0 +1,148 @@ +*** toinvalid.cpp.old Thu Jul 22 19:38:19 2004 +--- toinvalid.cpp Thu Jul 22 19:40:12 2004 +*************** +*** 45,54 **** +--- 45,55 ---- + #include "toresultlong.h" + #include "toresultview.h" + #include "tosql.h" + #include "totool.h" + ++ + #ifdef TO_KDE + # include <kmenubar.h> + #endif + + #include <qlabel.h> +*************** +*** 113,124 **** + tr("Refresh list"), + this,SLOT(refresh()), + toolbar); + + new QToolButton(QPixmap((const char **)compile_xpm), +! tr("Recompile selected"), +! tr("Recompile selected"), + this,SLOT(recompileSelected()), + toolbar); + + toolbar->setStretchableWidget(new QLabel(toolbar,TO_KDE_TOOLBAR_WIDGET)); + new toChangeConnection(toolbar,TO_KDE_TOOLBAR_WIDGET); +--- 114,125 ---- + tr("Refresh list"), + this,SLOT(refresh()), + toolbar); + + new QToolButton(QPixmap((const char **)compile_xpm), +! tr("Recompile all invalid"), +! tr("Recompile all invalid"), + this,SLOT(recompileSelected()), + toolbar); + + toolbar->setStretchableWidget(new QLabel(toolbar,TO_KDE_TOOLBAR_WIDGET)); + new toChangeConnection(toolbar,TO_KDE_TOOLBAR_WIDGET); +*************** +*** 126,139 **** + QSplitter *splitter=new QSplitter(Horizontal,this); + + Objects=new toResultLong(false,false,toQuery::Background,splitter); + Objects->setSQL(SQLListInvalid); + +! Objects->setSelectionMode(QListView::Extended); + connect(Objects,SIGNAL(selectionChanged()),this,SLOT(changeSelection())); +- connect(Objects,SIGNAL(currentChanged(QListViewItem *)), +- this,SLOT(changeSelection())); + + Source=new toResultExtract(false,splitter); + Source->setSQL(SQLListSource); + + connect(Source,SIGNAL(executed()),this,SLOT(refresh())); +--- 127,138 ---- + QSplitter *splitter=new QSplitter(Horizontal,this); + + Objects=new toResultLong(false,false,toQuery::Background,splitter); + Objects->setSQL(SQLListInvalid); + +! Objects->setSelectionMode(QListView::Single); + connect(Objects,SIGNAL(selectionChanged()),this,SLOT(changeSelection())); + + Source=new toResultExtract(false,splitter); + Source->setSQL(SQLListSource); + + connect(Source,SIGNAL(executed()),this,SLOT(refresh())); +*************** +*** 160,194 **** + QProgressDialog progress(tr("Recompiling all invalid"), + tr("Cancel"),Objects->childCount(),this,"progress",true); + progress.setCaption("Recompiling"); + progress.show(); + +- int i=0; + + for(QListViewItem *item=Objects->firstChild();item;item=item->nextSibling()) { + toResultViewItem *ci=dynamic_cast<toResultViewItem *>(item); +! if (ci&&ci->isSelected()) { + toConnection &conn=connection(); + progress.setLabelText("Recompiling "+ci->allText(1)+"."+ci->allText(2)); +! progress.setProgress(i); + qApp->processEvents(); + QString type=ci->allText(2); + QString sql; + if (type=="INDEX") + sql="ALTER "+ci->allText(2)+" "+conn.quote(ci->allText(0))+"."+conn.quote(ci->allText(1))+" REBUILD"; + else if (type=="PACKAGE BODY") +! sql="ALTER PACKAGE "+conn.quote(ci->allText(0))+"."+conn.quote(ci->allText(1))+" COMPILE BODY REUSE SETTINGS"; + else +! sql="ALTER "+ci->allText(2)+" "+conn.quote(ci->allText(0))+"."+conn.quote(ci->allText(1))+" COMPILE REUSE SETTINGS"; + try { + conn.execute(sql); + } catch(...) { + } + } +- i++; + } +! refresh(); + } + + void toInvalid::windowActivated(QWidget *widget) + { + if (widget==this) { +--- 159,196 ---- + QProgressDialog progress(tr("Recompiling all invalid"), + tr("Cancel"),Objects->childCount(),this,"progress",true); + progress.setCaption("Recompiling"); + progress.show(); + + + for(QListViewItem *item=Objects->firstChild();item;item=item->nextSibling()) { + toResultViewItem *ci=dynamic_cast<toResultViewItem *>(item); +! if (ci){ + toConnection &conn=connection(); + progress.setLabelText("Recompiling "+ci->allText(1)+"."+ci->allText(2)); +! progress.setProgress(progress.progress()+1); + qApp->processEvents(); ++ if (progress.wasCancelled()) ++ break; + QString type=ci->allText(2); + QString sql; + if (type=="INDEX") + sql="ALTER "+ci->allText(2)+" "+conn.quote(ci->allText(0))+"."+conn.quote(ci->allText(1))+" REBUILD"; + else if (type=="PACKAGE BODY") +! sql="ALTER PACKAGE "+conn.quote(ci->allText(0))+"."+conn.quote(ci->allText(1))+" COMPILE BODY"; + else +! sql="ALTER "+ci->allText(2)+" "+conn.quote(ci->allText(0))+"."+conn.quote(ci->allText(1))+" COMPILE"; + try { + conn.execute(sql); + } catch(...) { + } + } + } +! if (progress.isVisible()) +! progress.close(); +! qApp->processEvents(); +! this->refresh(); + } + + void toInvalid::windowActivated(QWidget *widget) + { + if (widget==this) { diff --git a/dev-db/tora/files/tora-1.3.14.1-race.patch b/dev-db/tora/files/tora-1.3.14.1-race.patch new file mode 100644 index 000000000000..509bb2aec70f --- /dev/null +++ b/dev-db/tora/files/tora-1.3.14.1-race.patch @@ -0,0 +1,24 @@ +--- tora-1.3.14.1/tooracleconnection.cpp 2004-07-02 07:27:57.000000000 +0200 ++++ tora-1.3.14.1.ivan/tooracleconnection.cpp 2004-10-17 05:07:04.000000000 +0200 +@@ -362,7 +362,7 @@ + virtual void cancel(void); + virtual bool eof(void) + { +- if (!Query) ++ if (!Query || Cancel) + return true; + return Query->eof(); + } +@@ -965,9 +965,10 @@ + oracleSub *conn=dynamic_cast<oracleSub *>(query()->connectionSub()); + if (!conn) + throw QString::fromLatin1("Internal error, not oracle sub connection"); +- if (Running) ++ if (Running) { + conn->Connection->cancel(); +- else { ++ Cancel=true; ++ } else { + Cancel=true; + conn->Lock.up(); + } diff --git a/dev-db/tora/files/tora-1.3.14.1-triggers.diff b/dev-db/tora/files/tora-1.3.14.1-triggers.diff new file mode 100644 index 000000000000..b30182cccf76 --- /dev/null +++ b/dev-db/tora/files/tora-1.3.14.1-triggers.diff @@ -0,0 +1,11 @@ +--- tobrowser.cpp.orig 2004-09-10 18:05:29.000000000 +0200 ++++ tobrowser.cpp 2004-09-10 17:58:45.000000000 +0200 +@@ -1456,6 +1456,8 @@ + curr->addTab(resultExtract,tr("Script")); + SecondMap[TAB_TRIGGER_EXTRACT]=resultExtract; + ++ connect(curr,SIGNAL(currentChanged(QWidget *)),this,SLOT(changeSecondTab(QWidget *))); ++ + splitter=new QSplitter(Horizontal,TopTab,TAB_ACCESS); + TopTab->addTab(splitter,tr("Access")); + #ifdef TOEXTENDED_MYSQL diff --git a/dev-db/tora/tora-1.3.13.ebuild b/dev-db/tora/tora-1.3.13.ebuild deleted file mode 100644 index 842b5409497d..000000000000 --- a/dev-db/tora/tora-1.3.13.ebuild +++ /dev/null @@ -1,60 +0,0 @@ -# Copyright 1999-2004 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-db/tora/tora-1.3.13.ebuild,v 1.8 2004/10/21 23:40:43 mr_bones_ Exp $ - -inherit debug - -IUSE="kde oci8 debug" -DESCRIPTION="TOra - Toolkit For Oracle" -HOMEPAGE="http://www.globecom.se/tora/" -SRC_URI="mirror://sourceforge/${PN}/${PN}-alpha-${PV}.tar.gz" - -SLOT="0" -LICENSE="GPL-2" -KEYWORDS="x86 ~ppc ~sparc ~alpha ~hppa ~amd64" - -DEPEND=">=x11-libs/qt-3.0.0 - dev-lang/perl - kde? ( >=kde-base/kdelibs-3.1 )" - -pkg_setup() { - if use oci8 && [ -z "$ORACLE_HOME" ] ; then - eerror "ORACLE_HOME variable is not set." - eerror - eerror "You must install Oracle >= 8i client for Linux in" - eerror "order to compile TOra with Oracle support." - eerror - eerror "Otherwise specify -oci8 in your USE variable." - eerror - eerror "You can download the Oracle software from" - eerror "http://otn.oracle.com/software/content.html" - die - fi -} - -src_compile() { - - # Need to fake out Qt or we'll get sandbox problems - REALHOME="$HOME" - mkdir -p $T/fakehome/.kde - mkdir -p $T/fakehome/.qt - export HOME="$T/fakehome" - addwrite "${QTDIR}/etc/settings" - - local myconf - myconf="--prefix=/usr --with-mono" - - use kde \ - && myconf="$myconf --with-kde" \ - || myconf="$myconf --without-kde" - use oci8 || myconf="$myconf --without-oracle" - - ./configure $myconf || die "configure failed" - emake || die "emake failed" -} - -src_install() { - #dodir ${D}/usr/bin - einstall ROOT=${D} - dodoc LICENSE.txt BUGS INSTALL NEWS README TODO -} diff --git a/dev-db/tora/tora-1.3.14.1.ebuild b/dev-db/tora/tora-1.3.14.1-r1.ebuild index b0f3bea80225..d6b5d10b919d 100644 --- a/dev-db/tora/tora-1.3.14.1.ebuild +++ b/dev-db/tora/tora-1.3.14.1-r1.ebuild @@ -1,8 +1,8 @@ # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-db/tora/tora-1.3.14.1.ebuild,v 1.3 2004/10/21 23:40:43 mr_bones_ Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-db/tora/tora-1.3.14.1-r1.ebuild,v 1.1 2004/10/29 16:13:09 rizzo Exp $ -inherit debug +inherit debug eutils IUSE="kde oracle debug" DESCRIPTION="TOra - Toolkit For Oracle" @@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${PN}-alpha-${PV}.tar.gz" SLOT="0" LICENSE="GPL-2" -KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa ~amd64" +KEYWORDS="x86 ~ppc ~sparc ~alpha ~hppa ~amd64" DEPEND=">=x11-libs/qt-3.0.0 dev-lang/perl @@ -32,6 +32,19 @@ pkg_setup() { fi } +src_unpack() { + unpack ${A} + cd ${S} + # http://sourceforge.net/tracker/index.php?func=detail&aid=1025950&group_id=16636&atid=316636 + epatch ${FILESDIR}/tora-1.3.14.1-triggers.diff + + # http://sourceforge.net/tracker/index.php?func=detail&aid=996061&group_id=16636&atid=316636 + + epatch ${FILESDIR}/tora-1.3.14.1-invalidobjects.diff + # http://sourceforge.net/tracker/index.php?func=detail&aid=1048530&group_id=16636&atid=316636 + epatch ${FILESDIR}/tora-1.3.14.1-race.patch +} + src_compile() { # Need to fake out Qt or we'll get sandbox problems |