Hello community, here is the log from the commit of package okteta for openSUSE:Factory checked in at 2013-07-22 17:20:19 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/okteta (Old) and /work/SRC/openSUSE:Factory/.okteta.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "okteta" Changes: -------- --- /work/SRC/openSUSE:Factory/okteta/okteta.changes 2013-07-08 07:27:44.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.okteta.new/okteta.changes 2013-07-22 17:20:21.000000000 +0200 @@ -1,0 +2,7 @@ +Mon Jul 15 08:14:18 UTC 2013 - [email protected] + +- Update to 4.10.95 + * KDE 4.11 RC 1 release + * See http://www.kde.org/announcements/announce-4.11-rc1.php + +------------------------------------------------------------------- Old: ---- okteta-4.10.90.tar.xz New: ---- okteta-4.10.95.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ okteta.spec ++++++ --- /var/tmp/diff_new_pack.5czBkw/_old 2013-07-22 17:20:22.000000000 +0200 +++ /var/tmp/diff_new_pack.5czBkw/_new 2013-07-22 17:20:22.000000000 +0200 @@ -1,7 +1,7 @@ # -# spec file for package okteta (Version 4.7.80_20111122) +# spec file for package okteta # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -15,13 +15,14 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + Name: okteta BuildRequires: libkde4-devel +Summary: Hex Editor License: GPL-2.0 and GFDL-1.2 Group: Development/Tools/Other -Summary: Hex Editor Url: http://www.kde.org/ -Version: 4.10.90 +Version: 4.10.95 Release: 0 Source0: %{name}-%{version}.tar.xz BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -33,8 +34,8 @@ Okteta is a hex editor for the KDE desktop. %package devel -Group: Development/Tools/Other Summary: Development files for the Okteta Hex Editor +Group: Development/Tools/Other Requires: %{name} = %{version} %description devel @@ -96,6 +97,4 @@ %{_kde4_libdir}/libkasten2*.so %{_kde4_libdir}/libokteta1*.so - - %changelog ++++++ okteta-4.10.90.tar.xz -> okteta-4.10.95.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okteta-4.10.90/core/piecetable/tests/CMakeLists.txt new/okteta-4.10.95/core/piecetable/tests/CMakeLists.txt --- old/okteta-4.10.90/core/piecetable/tests/CMakeLists.txt 2013-05-28 22:18:01.000000000 +0200 +++ new/okteta-4.10.95/core/piecetable/tests/CMakeLists.txt 2013-07-10 01:41:59.000000000 +0200 @@ -136,6 +136,8 @@ ########### grouppiecetablechangeabstractpiecetablechangeiftest ############### +# grouped changes break some assumptions and got workarounds, so disable for now +if(IWILLPICKUPWORKONOKTETACORE) set( grouppiecetablechangeabstractpiecetablechangeiftest_SRCS grouppiecetablechangeabstractpiecetablechangeiftest.cpp ${abstractpiecetablechangeiftest_SRCS} @@ -152,7 +154,7 @@ ) target_link_libraries( grouppiecetablechangeabstractpiecetablechangeiftest oktetacoretestutil ${KDE4_KDECORE_LIBS} ${QT_QTTEST_LIBRARY} ) - +endif() ########### grouppiecetablechangetest ############### Files old/okteta-4.10.90/doc/index.cache.bz2 and new/okteta-4.10.95/doc/index.cache.bz2 differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okteta-4.10.90/kasten/controllers/view/structures/datatypes/taggeduniondatainformation.cpp new/okteta-4.10.95/kasten/controllers/view/structures/datatypes/taggeduniondatainformation.cpp --- old/okteta-4.10.90/kasten/controllers/view/structures/datatypes/taggeduniondatainformation.cpp 2013-06-10 20:55:38.000000000 +0200 +++ new/okteta-4.10.95/kasten/controllers/view/structures/datatypes/taggeduniondatainformation.cpp 2013-07-10 01:41:59.000000000 +0200 @@ -151,11 +151,23 @@ TopLevelDataInformation* top = topLevelDataInformation(); Q_CHECK_PTR(top); + const QVector<DataInformation*>& oldChildren = currentChildren(); + qint64 readBits = 0; mWasAbleToRead = StructureDataInformation::readChildren(mChildren, input, address, bitsRemaining, bitOffset, &readBits, top); mLastIndex = determineSelection(top); const QVector<DataInformation*>& others = currentChildren(); + //check whether we have different children now, if yes we have to emit child count changed + if (oldChildren != others) { + const int fixedSize = mChildren.size(); + //tell the model that all children have changed by setting to 0 and then to new size + top->_childCountAboutToChange(this, fixedSize + oldChildren.size(), fixedSize); + top->_childCountChanged(this, fixedSize + oldChildren.size(), fixedSize); + top->_childCountAboutToChange(this, fixedSize, fixedSize + others.size()); + top->_childCountChanged(this, fixedSize, fixedSize + others.size()); + } + //this is important since the remaining children might have changed since before the read //where beginRead was called on the children at that time for (int i = 0; i < others.size(); i++) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okteta-4.10.90/kasten/controllers/view/structures/examples/okteta/structures/dynamic-array-js/metadata.desktop new/okteta-4.10.95/kasten/controllers/view/structures/examples/okteta/structures/dynamic-array-js/metadata.desktop --- old/okteta-4.10.90/kasten/controllers/view/structures/examples/okteta/structures/dynamic-array-js/metadata.desktop 2013-06-25 20:39:39.000000000 +0200 +++ new/okteta-4.10.95/kasten/controllers/view/structures/examples/okteta/structures/dynamic-array-js/metadata.desktop 2013-07-10 01:41:59.000000000 +0200 @@ -14,7 +14,7 @@ Name[es]=Prueba de arrays de tamaño dinámico (JS). Name[et]=Testing dynamic length arrays (JS). Do not translate, it's a waste of time Name[fi]=Testataan taulukkojen (JS) dynaamista pituutta. Älä kotoista, se on ajan tuhlausta. -Name[fr]=Test de tableaux de longueur dynamique (JS) +Name[fr]=Test de tableaux de longueur dynamique (JavaScript). Ne pas traduire, c'est une perte de temps Name[gl]=Proba de matrices de tamaño dinámico en JavaScript. Name[hu]=Dinamikus hosszúságú tömbök tesztelése (JS). Ne fordítsa le, csak időpocsékolás Name[it]=Prova degli array a lunghezza dinamica (JS). @@ -48,7 +48,7 @@ Comment[es]=Una estructura de prueba para arrays dinámicos (JS). Comment[et]=A test structure for dynamic arrays (JS). Do not translate, it's a waste of time Comment[fi]=Testataan taulukkojen (JS) dynaamista pituutta. Älä kotoista, se on ajan tuhlausta. -Comment[fr]=Un structure de test pour les tableaux dynamiques (JS) +Comment[fr]=Un structure de test pour les tableaux dynamiques (JavaScript). Ne pas traduire, c'est une perte de temps Comment[gl]=Unha estrutura de proba de matrices dinámicas en JavaScript. Comment[hu]=Tesztstruktúra dinamikus tömbökhöz (JS). Ne fordítsa le, csak időpocsékolás Comment[it]=Una struttura di prova per array a lunghezza dinamica (JS). diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okteta-4.10.90/kasten/controllers/view/structures/examples/okteta/structures/elf/metadata.desktop new/okteta-4.10.95/kasten/controllers/view/structures/examples/okteta/structures/elf/metadata.desktop --- old/okteta-4.10.90/kasten/controllers/view/structures/examples/okteta/structures/elf/metadata.desktop 2013-06-25 20:39:39.000000000 +0200 +++ new/okteta-4.10.95/kasten/controllers/view/structures/examples/okteta/structures/elf/metadata.desktop 2013-07-10 01:41:59.000000000 +0200 @@ -15,7 +15,7 @@ Name[es]=Estructura ELF Name[et]=ELF struktuur Name[fi]=ELF-rakenne -Name[fr]=Structure ELF +Name[fr]=Structure « ELF » Name[ga]=Struchtúr ELF Name[gl]=Estrutura ELF Name[hu]=ELF struktúra @@ -54,7 +54,7 @@ Comment[es]=Estructura para el formato ejecutable y enlazable (ELF) Comment[et]=Täidetava ja lingitava failivormingu (ELF) struktuur Comment[fi]=Rakenne ELF-tiedostomuodolle -Comment[fr]=Structure pour le format ELF (Executable and Linkable Format) +Comment[fr]=Structure pour le format « ELF » (« Executable and Linkable Format ») Comment[gl]=Estrutura para o formato executábel e ligábel (ELF). Comment[hu]=Struktúra a végrehajtható és kapcsolható formátumhoz (ELF) Comment[it]=Struttura per formato eseguibile e collegabile (ELF) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okteta-4.10.90/kasten/controllers/view/structures/examples/okteta/structures/elf-js/metadata.desktop new/okteta-4.10.95/kasten/controllers/view/structures/examples/okteta/structures/elf-js/metadata.desktop --- old/okteta-4.10.90/kasten/controllers/view/structures/examples/okteta/structures/elf-js/metadata.desktop 2013-06-25 20:39:39.000000000 +0200 +++ new/okteta-4.10.95/kasten/controllers/view/structures/examples/okteta/structures/elf-js/metadata.desktop 2013-07-10 01:41:59.000000000 +0200 @@ -17,7 +17,7 @@ Name[es]=Estructura ELF Name[et]=ELF struktuur Name[fi]=ELF-rakenne -Name[fr]=Structure ELF +Name[fr]=Structure « ELF » Name[ga]=Struchtúr ELF Name[gl]=Estrutura ELF Name[hu]=ELF struktúra @@ -56,7 +56,7 @@ Comment[es]=Estructura para el formato ejecutable y enlazable (ELF) Comment[et]=Täidetava ja lingitava failivormingu (ELF) struktuur Comment[fi]=Rakenne ELF-tiedostomuodolle -Comment[fr]=Structure pour le format ELF (Executable and Linkable Format) +Comment[fr]=Structure pour le format « ELF » (« Executable and Linkable Format ») Comment[gl]=Estrutura para o formato executábel e ligábel (ELF). Comment[hu]=Struktúra a végrehajtható és kapcsolható formátumhoz (ELF) Comment[it]=Struttura per formato eseguibile e collegabile (ELF) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okteta-4.10.90/kasten/controllers/view/structures/examples/okteta/structures/flags/metadata.desktop new/okteta-4.10.95/kasten/controllers/view/structures/examples/okteta/structures/flags/metadata.desktop --- old/okteta-4.10.90/kasten/controllers/view/structures/examples/okteta/structures/flags/metadata.desktop 2013-06-25 20:39:39.000000000 +0200 +++ new/okteta-4.10.95/kasten/controllers/view/structures/examples/okteta/structures/flags/metadata.desktop 2013-07-10 01:41:59.000000000 +0200 @@ -14,7 +14,7 @@ Name[es]=Prueba de indicadores de bits Name[et]=Bitilippude testimine Name[fi]=Bittikenttien testausta -Name[fr]=Test des indicateurs de bits +Name[fr]=Test de champs de bits Name[gl]=Proba das marcas de bits Name[hu]=Bitzászlók tesztelése Name[it]=Flag di bit di prova @@ -46,7 +46,7 @@ Comment[es]=Una prueba para indicadores de bits Comment[et]=Bitilippude test Comment[fi]=Bittikenttien testi -Comment[fr]=Un test pour les indicateurs de bits +Comment[fr]=Un test pour les champs de bits Comment[gl]=Unha proba das marcas de bits. Comment[hu]=Teszt a bitzászlókhoz Comment[it]=Una prova per flag di bit diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okteta-4.10.90/kasten/controllers/view/structures/examples/okteta/structures/png/metadata.desktop new/okteta-4.10.95/kasten/controllers/view/structures/examples/okteta/structures/png/metadata.desktop --- old/okteta-4.10.90/kasten/controllers/view/structures/examples/okteta/structures/png/metadata.desktop 2013-06-25 20:39:39.000000000 +0200 +++ new/okteta-4.10.95/kasten/controllers/view/structures/examples/okteta/structures/png/metadata.desktop 2013-07-10 01:41:59.000000000 +0200 @@ -16,7 +16,7 @@ Name[es]=Cabecera de archivo PNG Name[et]=PNG-faili päis Name[fi]=PNG-tiedosto-otsake -Name[fr]=En-tête de fichier PNG +Name[fr]=En-tête de fichier « PNG » Name[ga]=Ceanntásc comhaid PNG Name[gl]=Cabeceira de ficheiro PNG Name[hu]=PNG-fájl fejléc @@ -55,7 +55,7 @@ Comment[es]=Una estructura de prueba que contiene la cabecera de un archivo PNG (el archivo debe fijarse como big-endian) Comment[et]=PNG-faili päist sisaldav teststruktuur (fail peab olema jämedaotsaline) Comment[fi]=Testirakenne, joka sisältää PNG-tiedosto-otsakkeen (tiedoston on oltava asetettu big-endian -muotoon) -Comment[fr]=Uns structure de test contenant l'en-tête de fichier PNG (le fichier doit être défini comme grand-boutiste) +Comment[fr]=Une structure de test contenant l'en-tête de fichier « PNG » (le fichier doit être défini comme « grand-boutiste ») Comment[ga]=Struchtúr tástála ina bhfuil ceanntásc an chomhaid PNG (ní mór don chomhad a bheith mórcheannach) Comment[gl]=A estrutura dunha proba coa cabeceira dun ficheiro PNG. O ficheiro debe configurarse como big-endian. Comment[hu]=PNG-fájl fejlécet tartalmazó tesztstruktúra (a fájlnak BE bájtsorrendűnek kell lennie) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okteta-4.10.90/kasten/controllers/view/structures/examples/okteta/structures/simple-js/metadata.desktop new/okteta-4.10.95/kasten/controllers/view/structures/examples/okteta/structures/simple-js/metadata.desktop --- old/okteta-4.10.90/kasten/controllers/view/structures/examples/okteta/structures/simple-js/metadata.desktop 2013-06-25 20:39:39.000000000 +0200 +++ new/okteta-4.10.95/kasten/controllers/view/structures/examples/okteta/structures/simple-js/metadata.desktop 2013-07-10 01:41:59.000000000 +0200 @@ -55,7 +55,7 @@ Comment[es]=Solo para probar estructuras definidas en JS Comment[et]=JavaScriptis defineeritud teststruktuurid Comment[fi]=Testataan vain rakenteita, jotka on määritelty JS:ssä -Comment[fr]=Simplement le test de structures définies en JS +Comment[fr]=Test en cours de structures définies en JavaScript Comment[gl]=Simples estruturas de probas definidas en JavaScript. Comment[hu]=Csak a JS-ben meghatározott struktúrák tesztelése Comment[it]=Prova delle strutture definite in JavaScript diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okteta-4.10.90/kasten/controllers/view/structures/parsers/osdparser.cpp new/okteta-4.10.95/kasten/controllers/view/structures/parsers/osdparser.cpp --- old/okteta-4.10.90/kasten/controllers/view/structures/parsers/osdparser.cpp 2013-06-10 20:55:38.000000000 +0200 +++ new/okteta-4.10.95/kasten/controllers/view/structures/parsers/osdparser.cpp 2013-07-10 01:41:59.000000000 +0200 @@ -41,6 +41,8 @@ #include <QDomDocument> #include <QScriptEngine> +#include <KDebug> + using namespace ParserStrings; OsdParser::OsdParser(const QString& pluginName, const QString& absolutePath) @@ -180,8 +182,12 @@ if (!data) { - data = new DummyDataInformation(0, - fileInfo.absoluteFilePath() + QLatin1String("_element") + QString::number(count)); + QString name = readProperty(elem, PROPERTY_NAME); + if (name.isEmpty()) + name = fileInfo.absoluteFilePath() + QLatin1String("_element") + QString::number(count); + kDebug() << "Failed to parse element" << elem.tagName() << name; + kDebug() << "Parsing messages were:" << logger->messages(); + data = new DummyDataInformation(0, name); } TopLevelDataInformation* topData = new TopLevelDataInformation(data, logger, eng, fileInfo); QString lockOffsetStr = readProperty(elem, PROPERTY_DEFAULT_LOCK_OFFSET); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okteta-4.10.90/kasten/controllers/view/structures/script/scripthandler.cpp new/okteta-4.10.95/kasten/controllers/view/structures/script/scripthandler.cpp --- old/okteta-4.10.90/kasten/controllers/view/structures/script/scripthandler.cpp 2013-06-10 20:55:38.000000000 +0200 +++ new/okteta-4.10.95/kasten/controllers/view/structures/script/scripthandler.cpp 2013-07-10 01:41:59.000000000 +0200 @@ -60,7 +60,7 @@ //check if has a validation function: QScriptValue validationFunc = data->validationFunc(); - if (!validationFunc.isValid()) + if (validationFunc.isValid()) { #ifdef OKTETA_DEBUG_SCRIPT mDebugger->attachTo(mEngine.data()); @@ -94,8 +94,8 @@ if (!str.isEmpty()) data->setValidationError(str); } + data->mHasBeenValidated = true; } - data->mHasBeenValidated = true; } void ScriptHandler::updateDataInformation(DataInformation* data) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okteta-4.10.90/kasten/controllers/view/structures/structtool.cpp new/okteta-4.10.95/kasten/controllers/view/structures/structtool.cpp --- old/okteta-4.10.90/kasten/controllers/view/structures/structtool.cpp 2013-06-10 20:55:38.000000000 +0200 +++ new/okteta-4.10.95/kasten/controllers/view/structures/structtool.cpp 2013-07-10 01:41:59.000000000 +0200 @@ -307,6 +307,8 @@ TopLevelDataInformation* data = def->structure(name); if (data) addChildItem(data); + else + kDebug() << "Could not find structure with name" << name << "in" << pluginName; } } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okteta-4.10.90/kasten/controllers/view/structures/structview.cpp new/okteta-4.10.95/kasten/controllers/view/structures/structview.cpp --- old/okteta-4.10.90/kasten/controllers/view/structures/structview.cpp 2013-05-28 22:18:01.000000000 +0200 +++ new/okteta-4.10.95/kasten/controllers/view/structures/structview.cpp 2013-07-10 01:41:59.000000000 +0200 @@ -72,8 +72,7 @@ mStructTreeView->setItemsExpandable(true); mStructTreeView->setUniformRowHeights(true); mStructTreeView->setAllColumnsShowFocus(true); - mStructTreeView->setEditTriggers(QAbstractItemView::DoubleClicked - | QAbstractItemView::EditKeyPressed); + mStructTreeView->setEditTriggers(QAbstractItemView::DoubleClicked | QAbstractItemView::EditKeyPressed); mStructTreeView->setItemDelegate(mDelegate); mStructTreeView->setDragEnabled(false); mStructTreeView->setSortingEnabled(false); @@ -289,7 +288,7 @@ QModelIndex current = mStructTreeView->currentIndex(); mLockStructureButton->setEnabled(mTool->canStructureBeLocked(current)); setLockButtonState(mTool->isStructureLocked(current)); - mValidateButton->setEnabled(validModel && current.isValid()); + mValidateButton->setEnabled(validModel); } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okteta-4.10.90/program/about.cpp new/okteta-4.10.95/program/about.cpp --- old/okteta-4.10.90/program/about.cpp 2013-06-25 20:39:39.000000000 +0200 +++ new/okteta-4.10.95/program/about.cpp 2013-07-10 01:41:59.000000000 +0200 @@ -28,7 +28,7 @@ // Program static const char ProgramId[] = "okteta"; -static const char ProgramVersion[] = "0.10.85"; +static const char ProgramVersion[] = "0.10.90"; static const char ProgramHomepage[] = "http://userbase.kde.org/Okteta";; // Author static const char FWHKEmailAddress[] = "[email protected]"; -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
