Hello community, here is the log from the commit of package okteta for openSUSE:Factory checked in at 2014-03-18 17:17:13 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 2014-02-20 07:58:42.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.okteta.new/okteta.changes 2014-03-18 17:17:14.000000000 +0100 @@ -1,0 +2,14 @@ +Thu Mar 13 20:51:36 UTC 2014 - [email protected] + +- Update to 4.12.90 + * KDE 4.13 Beta 2 release + * See http://www.kde.org/announcements/announce-4.13-beta2.php + +------------------------------------------------------------------- +Fri Mar 7 11:36:07 UTC 2014 - [email protected] + +- Update to 4.12.80 + * KDE 4.13 Beta 1 release + * See http://www.kde.org/announcements/announce-4.13-beta1.php + +------------------------------------------------------------------- Old: ---- okteta-4.12.2.tar.xz New: ---- okteta-4.12.90.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ okteta.spec ++++++ --- /var/tmp/diff_new_pack.lxDRq1/_old 2014-03-18 17:17:15.000000000 +0100 +++ /var/tmp/diff_new_pack.lxDRq1/_new 2014-03-18 17:17:15.000000000 +0100 @@ -22,7 +22,7 @@ License: GPL-2.0 and GFDL-1.2 Group: Development/Tools/Other Url: http://www.kde.org/ -Version: 4.12.2 +Version: 4.12.90 Release: 0 Source0: %{name}-%{version}.tar.xz BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ okteta-4.12.2.tar.xz -> okteta-4.12.90.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okteta-4.12.2/core/CMakeLists.txt new/okteta-4.12.90/core/CMakeLists.txt --- old/okteta-4.12.2/core/CMakeLists.txt 2014-01-12 15:00:52.000000000 +0100 +++ new/okteta-4.12.90/core/CMakeLists.txt 2014-03-12 22:34:15.000000000 +0100 @@ -16,6 +16,7 @@ codecs/valuecodec.cpp codecs/charcodec.cpp codecs/decimalbytecodec.cpp + codecs/usasciicharcodec.cpp codecs/ebcdic1047charcodec.cpp codecs/hexadecimalbytecodec.cpp codecs/octalbytecodec.cpp diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okteta-4.12.2/core/codecs/charcodec.cpp new/okteta-4.12.90/core/codecs/charcodec.cpp --- old/okteta-4.12.2/core/codecs/charcodec.cpp 2014-01-12 15:00:52.000000000 +0100 +++ new/okteta-4.12.90/core/codecs/charcodec.cpp 2014-03-12 22:34:15.000000000 +0100 @@ -25,6 +25,7 @@ // lib #include "textcharcodec.h" #include "ebcdic1047charcodec.h" +#include "usasciicharcodec.h" // Qt #include <QtCore/QStringList> @@ -39,6 +40,7 @@ if( codecNames.isEmpty() ) { codecNames = TextCharCodec::codecNames(); + codecNames.append( USASCIICharCodec::codecName() ); codecNames.append( EBCDIC1047CharCodec::codecName() ); } @@ -52,6 +54,8 @@ if( TextCharCodec::codecNames().indexOf(name) != -1 ) result = TextCharCodec::createCodec( name ); + else if( USASCIICharCodec::codecName() == name ) + result = USASCIICharCodec::create(); else if( EBCDIC1047CharCodec::codecName() == name ) result = EBCDIC1047CharCodec::create(); else diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okteta-4.12.2/core/codecs/usasciicharcodec.cpp new/okteta-4.12.90/core/codecs/usasciicharcodec.cpp --- old/okteta-4.12.2/core/codecs/usasciicharcodec.cpp 1970-01-01 01:00:00.000000000 +0100 +++ new/okteta-4.12.90/core/codecs/usasciicharcodec.cpp 2014-03-12 22:34:15.000000000 +0100 @@ -0,0 +1,71 @@ +/* + This file is part of the Okteta Core library, made within the KDE community. + + Copyright 2014 Friedrich W. H. Kossebau <[email protected]> + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) version 3, or any + later version accepted by the membership of KDE e.V. (or its + successor approved by the membership of KDE e.V.), which shall + act as a proxy defined in Section 6 of version 3 of the license. + + This library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with this library. If not, see <http://www.gnu.org/licenses/>. +*/ + +#include "usasciicharcodec.h" + +// lib +#include <character.h> +// Qt +#include <QtCore/QString> + + +namespace Okteta +{ + +static const char USASCIICharCodecName[] = "US-ASCII"; + + +bool USASCIICharCodec::encode( Byte* byte, const QChar& _char ) const +{ + const int unicodeValue = _char.unicode(); + // not in range? + if( 0x007F < unicodeValue ) + return false; + + *byte = unicodeValue; + + return true; +} + +Character USASCIICharCodec::decode( Byte byte ) const +{ + return Character( QChar(ushort( byte )), (byte > 0x007F) ); +} + +bool USASCIICharCodec::canEncode( const QChar& _char ) const +{ + return ( _char.unicode() <= 0x007F ); +} + + +const QString& USASCIICharCodec::name() const +{ + return codecName(); +} + +const QString& USASCIICharCodec::codecName() +{ + static const QString name = QString::fromLatin1( USASCIICharCodecName ); + return name; +} + +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okteta-4.12.2/core/codecs/usasciicharcodec.h new/okteta-4.12.90/core/codecs/usasciicharcodec.h --- old/okteta-4.12.2/core/codecs/usasciicharcodec.h 1970-01-01 01:00:00.000000000 +0100 +++ new/okteta-4.12.90/core/codecs/usasciicharcodec.h 2014-03-12 22:34:15.000000000 +0100 @@ -0,0 +1,57 @@ +/* + This file is part of the Okteta Core library, made within the KDE community. + + Copyright 2014 Friedrich W. H. Kossebau <[email protected]> + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) version 3, or any + later version accepted by the membership of KDE e.V. (or its + successor approved by the membership of KDE e.V.), which shall + act as a proxy defined in Section 6 of version 3 of the license. + + This library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with this library. If not, see <http://www.gnu.org/licenses/>. +*/ + +#ifndef OKTETA_USASCIICHARCODEC_H +#define OKTETA_USASCIICHARCODEC_H + +// lib +#include <charcodec.h> + + +namespace Okteta +{ + +// +class USASCIICharCodec : public CharCodec +{ + protected: + USASCIICharCodec(); + + public: // CharCodec API + virtual Character decode( Byte byte ) const; + virtual bool encode( Byte* byte, const QChar& _char ) const; + virtual bool canEncode( const QChar& _char ) const; + virtual const QString& name() const; + + public: + static USASCIICharCodec* create(); + static const QString& codecName(); +}; + + +inline USASCIICharCodec::USASCIICharCodec() {} + +inline USASCIICharCodec* USASCIICharCodec::create() { return new USASCIICharCodec(); } + +} + +#endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okteta-4.12.2/gui/CMakeLists.txt new/okteta-4.12.90/gui/CMakeLists.txt --- old/okteta-4.12.2/gui/CMakeLists.txt 2014-01-12 15:00:52.000000000 +0100 +++ new/okteta-4.12.90/gui/CMakeLists.txt 2014-03-12 22:34:15.000000000 +0100 @@ -82,6 +82,10 @@ line.h linepositionrange.h linerange.h + coord.h + coordrange.h + coordrangelist.h + selection.h abstractbytearraycolumnrenderer.h offsetcolumnrenderer.h bordercolumnrenderer.h @@ -92,7 +96,7 @@ abstractbytearrayview.h bytearraycolumnview.h bytearrayrowview.h - bytearraytablelayout.h + bytearraytablelayout.h bytearraytableranges.h offsetformat.h ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okteta-4.12.2/gui/bytearraytableranges.h new/okteta-4.12.90/gui/bytearraytableranges.h --- old/okteta-4.12.2/gui/bytearraytableranges.h 2014-01-12 15:00:52.000000000 +0100 +++ new/okteta-4.12.90/gui/bytearraytableranges.h 2014-03-12 22:34:15.000000000 +0100 @@ -28,7 +28,7 @@ #include "coordrangelist.h" #include "oktetagui_export.h" // Okteta core -#include "addressrangelist.h" +#include "addressrange.h" namespace Okteta diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okteta-4.12.2/kasten/controllers/CMakeLists.txt new/okteta-4.12.90/kasten/controllers/CMakeLists.txt --- old/okteta-4.12.2/kasten/controllers/CMakeLists.txt 2014-01-12 15:00:52.000000000 +0100 +++ new/okteta-4.12.90/kasten/controllers/CMakeLists.txt 2014-03-12 22:34:15.000000000 +0100 @@ -491,6 +491,7 @@ view/bookmarks/bookmarkstoolfactory.h view/bookmarks/bookmarkstoolviewfactory.h view/overwritemode/overwritemodecontroller.h + view/poddecoder/poddata.h view/poddecoder/poddecodertool.h view/poddecoder/poddecodertoolview.h view/poddecoder/poddecodertoolfactory.h @@ -525,19 +526,26 @@ view/viewstatus/viewstatuscontroller.h view/viewprofiles/viewprofilecontroller.h view/viewprofiles/viewprofilesmanagecontroller.h + view/stringsextract/containedstring.h view/stringsextract/stringsextracttool.h view/stringsextract/stringsextracttoolview.h view/stringsextract/stringsextracttoolfactory.h view/stringsextract/stringsextracttoolviewfactory.h view/search/searchcontroller.h view/search/searchuserqueryable.h - view/structures/structtool.h +# structtool.h cannot be installed as it pulls (too) many private uninstalled headers +# KF5 TODO: any tools/controllers and views should be created by the resp. factories +# since some time, no more directly. +# So on next ABI change depublish tools/controllers & their views +# For now keeping all installed, in case someone is using them still/already. +# view/structures/structtool.h view/structures/structtoolview.h view/structures/structurestoolfactory.h view/structures/structurestoolviewfactory.h document/info/documentinfotoolview.h document/info/documentinfotool.h document/overwriteonly/overwriteonlycontroller.h + ${CMAKE_CURRENT_BINARY_DIR}/config-qca2.h ) kde4_add_library( ${oktetakastencontrollers_LIB} SHARED ${OKTETA_KASTEN_CONTROLLERS_SRCS} ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okteta-4.12.2/kasten/controllers/view/structures/examples/okteta/structures/flags/metadata.desktop new/okteta-4.12.90/kasten/controllers/view/structures/examples/okteta/structures/flags/metadata.desktop --- old/okteta-4.12.2/kasten/controllers/view/structures/examples/okteta/structures/flags/metadata.desktop 2014-01-12 15:00:52.000000000 +0100 +++ new/okteta-4.12.90/kasten/controllers/view/structures/examples/okteta/structures/flags/metadata.desktop 2014-03-12 22:34:15.000000000 +0100 @@ -19,6 +19,7 @@ Name[hu]=Bitzászlók tesztelése Name[it]=Flag di bit di prova Name[kk]=Сынақ бит-жалаушалары +Name[ko]=비트 플래그 시험 Name[nb]=Tester bitflagg Name[nl]=Bitflags testen Name[pl]=Testowanie bitflags @@ -51,6 +52,7 @@ Comment[hu]=Teszt a bitzászlókhoz Comment[it]=Una prova per flag di bit Comment[kk]=Бит-жалаушаларының сынағы +Comment[ko]=비트 플래그 시험 Comment[nb]=En test for bitflagg Comment[nl]=Een test voor bitflags Comment[pl]=Test dla bitflags diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okteta-4.12.2/kasten/core/document/bytearraydocument.h new/okteta-4.12.90/kasten/core/document/bytearraydocument.h --- old/okteta-4.12.2/kasten/core/document/bytearraydocument.h 2014-01-12 15:00:52.000000000 +0100 +++ new/okteta-4.12.90/kasten/core/document/bytearraydocument.h 2014-03-12 22:34:15.000000000 +0100 @@ -29,7 +29,15 @@ // Kasten core #include <person.h> #include <userlistable.h> -#include <versionable.h> +// HACK: Both the Okteta and Kasten libs have a versionable.h +// and in all the installed headers the files are included without the +// path prefix matching the namespace. To avoid inclusion of the wrong file if +// Okteta include dirs listed are before the Kasten ones, workaround with a +// relative path matching the situation when installed +// Uses the special forwarding file kasten/core/versionable.h for build +// KF5 TODO: all includes from installed headers need to be fixed up, there is +// no namespace protection for all of them currently +#include "../versionable.h" #include <abstractdocument.h> // Qt #include <QtCore/QString> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okteta-4.12.2/kasten/core/versionable.h new/okteta-4.12.90/kasten/core/versionable.h --- old/okteta-4.12.2/kasten/core/versionable.h 1970-01-01 01:00:00.000000000 +0100 +++ new/okteta-4.12.90/kasten/core/versionable.h 2014-03-12 22:34:15.000000000 +0100 @@ -0,0 +1,2 @@ +// This file is part of a hack, see document/bytearraydocument.h +#include <document/versionable.h> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okteta-4.12.2/libs/kasten/includes/ModelDataGenerateThread new/okteta-4.12.90/libs/kasten/includes/ModelDataGenerateThread --- old/okteta-4.12.2/libs/kasten/includes/ModelDataGenerateThread 2014-01-12 15:00:52.000000000 +0100 +++ new/okteta-4.12.90/libs/kasten/includes/ModelDataGenerateThread 2014-03-12 22:34:15.000000000 +0100 @@ -1 +1 @@ -#include "../../kasten2/modelstreamgeneratethread.h" +#include "../../kasten2/modeldatageneratethread.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okteta-4.12.2/program/about.cpp new/okteta-4.12.90/program/about.cpp --- old/okteta-4.12.2/program/about.cpp 2014-01-12 15:00:52.000000000 +0100 +++ new/okteta-4.12.90/program/about.cpp 2014-03-12 22:34:15.000000000 +0100 @@ -28,7 +28,7 @@ // Program static const char ProgramId[] = "okteta"; -static const char ProgramVersion[] = "0.12.2"; +static const char ProgramVersion[] = "0.12.90"; static const char ProgramHomepage[] = "http://userbase.kde.org/Okteta";; // Author static const char FWHKEmailAddress[] = "[email protected]"; @@ -40,7 +40,7 @@ ki18n("Okteta"), ProgramVersion, // name ki18n("Hex editor"), // description KAboutData::License_GPL_V2, - ki18n("Copyright 2006-2013 Friedrich W. H. Kossebau"), //copyright + ki18n("Copyright 2006-2014 Friedrich W. H. Kossebau"), //copyright ki18n("Edit the raw data of files"), // comment ProgramHomepage ) { -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
