Hello community,
here is the log from the commit of package kig for openSUSE:Factory checked in at 2014-03-18 16:20:43
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/kig (Old)
and /work/SRC/openSUSE:Factory/.kig.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kig"
Changes:
--------
--- /work/SRC/openSUSE:Factory/kig/kig.changes 2014-02-20 07:55:56.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.kig.new/kig.changes 2014-03-18 16:20:44.000000000 +0100
@@ -1,0 +2,14 @@
+Thu Mar 13 20:15:35 UTC 2014 - tittiatcoke@gmail.com
+
+- 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 10:05:52 UTC 2014 - tittiatcoke@gmail.com
+
+- Update to 4.12.80
+ * KDE 4.13 Beta 1 release
+ * See http://www.kde.org/announcements/announce-4.13-beta1.php
+
+-------------------------------------------------------------------
Old:
----
kig-4.12.2.tar.xz
New:
----
kig-4.12.90.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kig.spec ++++++
--- /var/tmp/diff_new_pack.e1TcLU/_old 2014-03-18 16:20:44.000000000 +0100
+++ /var/tmp/diff_new_pack.e1TcLU/_new 2014-03-18 16:20:44.000000000 +0100
@@ -17,7 +17,7 @@
Name: kig
-Version: 4.12.2
+Version: 4.12.90
Release: 0
Summary: Interactive Geometry
License: GPL-2.0+
++++++ kig-4.12.2.tar.xz -> kig-4.12.90.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kig-4.12.2/CMakeLists.txt new/kig-4.12.90/CMakeLists.txt
--- old/kig-4.12.2/CMakeLists.txt 2014-01-02 01:47:50.000000000 +0100
+++ new/kig-4.12.90/CMakeLists.txt 2014-02-13 22:57:45.000000000 +0100
@@ -25,6 +25,10 @@
add_definitions (${QT_DEFINITIONS} ${KDE4_DEFINITIONS} -DQT_USE_FAST_CONCATENATION -DQT_USE_FAST_OPERATOR_PLUS)
include_directories (${QDBUS_INCLUDE_DIRS} ${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR} ${KDE4_INCLUDES})
+if(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID STREQUAL "Clang" OR CMAKE_CXX_COMPILER_ID STREQUAL "Intel")
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
+endif()
+
kde4_no_enable_final(kig)
find_package(BoostPython)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kig-4.12.2/filters/filter.cc new/kig-4.12.90/filters/filter.cc
--- old/kig-4.12.2/filters/filter.cc 2014-01-02 01:47:50.000000000 +0100
+++ new/kig-4.12.90/filters/filter.cc 2014-02-13 22:57:45.000000000 +0100
@@ -105,10 +105,3 @@
{
return KigFilterNative::instance()->save( data, tofile );
}
-
-/*
-bool KigFilters::save( const KigDocument& data, QTextStream& stream )
-{
- return KigFilterNative::instance()->save( data, stream );
-}
-*/
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kig-4.12.2/filters/filter.h new/kig-4.12.90/filters/filter.h
--- old/kig-4.12.2/filters/filter.h 2014-01-02 01:47:50.000000000 +0100
+++ new/kig-4.12.90/filters/filter.h 2014-02-13 22:57:45.000000000 +0100
@@ -35,7 +35,6 @@
static KigFilters* instance();
KigFilter* find (const QString& mime);
-// bool save ( const KigDocument& data, QTextStream& stream );
/**
* saving is always done with the native filter. We don't support
* output filters..
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kig-4.12.2/filters/native-filter.cc new/kig-4.12.90/filters/native-filter.cc
--- old/kig-4.12.2/filters/native-filter.cc 2014-01-02 01:47:50.000000000 +0100
+++ new/kig-4.12.90/filters/native-filter.cc 2014-02-13 22:57:45.000000000 +0100
@@ -793,10 +793,3 @@
// we should never reach this point...
return false;
}
-
-/*
-bool KigFilterNative::save( const KigDocument& data, QTextStream& stream )
-{
- return save07( data, stream );
-}
-*/
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kig-4.12.2/kig/kig.cpp new/kig-4.12.90/kig/kig.cpp
--- old/kig-4.12.2/kig/kig.cpp 2014-01-02 01:47:50.000000000 +0100
+++ new/kig-4.12.90/kig/kig.cpp 2014-02-13 22:57:45.000000000 +0100
@@ -43,9 +43,13 @@
#include
#include
+#include <KService>
+
Kig::Kig()
: KParts::MainWindow(), m_part( 0 )
{
+ KService::Ptr kigpartService = KService::serviceByDesktopName("kig_part");
+
setObjectName( QLatin1String( "Kig" ) );
// setting the configation file
config = new KConfig( "kigrc" );
@@ -54,37 +58,29 @@
// then, setup our actions
setupActions();
- // this routine will find and load our Part. it finds the Part by
- // name which is a bad idea usually.. but it's alright in this
- // case since our Part is made for this Shell
- KPluginLoader libraryLoader( "kigpart" );
+ if ( kigpartService )
+ {
+ m_part = kigpartService->createInstance< KParts::ReadWritePart >( this );
+ m_mimeTypes = kigpartService->mimeTypes();
+ if (m_part)
+ {
+ // tell the KParts::MainWindow that this is indeed the main widget
+ setCentralWidget(m_part->widget());
- libraryLoader.setLoadHints( QLibrary::ExportExternalSymbolsHint );
+ // and integrate the part's GUI with the shell's
+ createGUI(m_part);
- if ( KPluginFactory* factory = libraryLoader.factory() )
- {
- // now that the Part is loaded, we cast it to a Part to get
- // our hands on it
- m_part = factory->create< KParts::ReadWritePart >( this );
- if (m_part)
- {
- // tell the KParts::MainWindow that this is indeed the main widget
- setCentralWidget(m_part->widget());
-
- // and integrate the part's GUI with the shell's
- // FIXME!!! disabling for now as it seems to create a unending loop
- createGUI(m_part);
- // finally show tip-of-day ( if the user wants it :) )
- QTimer::singleShot( 0, this, SLOT( startupTipOfDay() ) );
- }
+ // finally show tip-of-day ( if the user wants it :) )
+ QTimer::singleShot( 0, this, SLOT( startupTipOfDay() ) );
+ }
}
else
{
- // if we couldn't find our Part, we exit since the Shell by
- // itself can't do anything useful
- KMessageBox::error(this, i18n( "Could not find the necessary Kig library, check your installation." ) );
- KApplication::exit();
- return;
+ // if we couldn't find our Part, we exit since the Shell by
+ // itself can't do anything useful
+ KMessageBox::error(this, i18n( "Could not find the necessary Kig library, check your installation." ) );
+ QApplication::exit();
+ return;
}
// we have drag'n'drop
@@ -191,25 +187,7 @@
bool Kig::queryClose()
{
- if (!m_part->isReadWrite() || !m_part->isModified()) return true;
- switch( KMessageBox::warningYesNoCancel
- (
- widget(),
- i18n("Save changes to document %1?", m_part->url().toLocalFile()),
- i18n("Save Changes?"),KStandardGuiItem::save(),KStandardGuiItem::discard()
- ))
- {
- case KMessageBox::Yes:
- if (m_part->save()) return true;
- else return false;
- break;
- case KMessageBox::No:
- return true;
- break;
- default: // cancel
- return false;
- break;
- };
+ return m_part->queryClose();
}
void Kig::dragEnterEvent(QDragEnterEvent* e)
@@ -230,17 +208,8 @@
void Kig::fileOpen()
{
- QString formats =
- i18n( "*.kig *.kigz *.seg *.fgeo *.fig *.FIG|All Supported Files (*.kig *.kigz *.seg *.fgeo *.fig)\n"
- "*.kig|Kig Documents (*.kig)\n"
- "*.kigz|Compressed Kig Documents (*.kigz)\n"
- "*.kgeo|KGeo Documents (*.kgeo)\n"
- "*.seg|KSeg Documents (*.seg)\n"
- "*.fgeo|Dr. Geo Documents (*.fgeo)\n"
- "*.fig *.FIG|Cabri Documents (*.fig *.FIG)" );
-
// this slot is connected to the KStandardAction::open action...
- QString file_name = KFileDialog::getOpenFileName( KUrl( "kfiledialog:///document" ), formats );
+ QString file_name = KFileDialog::getOpenFileName( KUrl( "kfiledialog:///document" ), m_mimeTypes.join( " " ) );
if (!file_name.isEmpty()) openUrl(file_name);
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kig-4.12.2/kig/kig.h new/kig-4.12.90/kig/kig.h
--- old/kig-4.12.2/kig/kig.h 2014-01-02 01:47:50.000000000 +0100
+++ new/kig-4.12.90/kig/kig.h 2014-02-13 22:57:45.000000000 +0100
@@ -106,7 +106,7 @@
void setupActions();
KParts::ReadWritePart *m_part;
-
+ QStringList m_mimeTypes;
KRecentFilesAction *m_recentFilesAction;
KConfig* config;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kig-4.12.2/kig/kig_part.cpp new/kig-4.12.90/kig/kig_part.cpp
--- old/kig-4.12.2/kig/kig_part.cpp 2014-01-02 01:47:50.000000000 +0100
+++ new/kig-4.12.90/kig/kig_part.cpp 2014-02-13 22:57:45.000000000 +0100
@@ -413,13 +413,10 @@
KMessageBox::sorry
(
widget(),
- i18n( "You tried to open a document of type \"%1\"; unfortunately, "
- "Kig does not support this format. If you think the format in "
- "question would be worth implementing support for, you can "
- "always ask us nicely on mailto:pino@kde.org "
- "or do the work yourself and send me a patch."
+ i18n( "You tried to open a document of type \"%1\"; unfortunately, Kig does not support this format. If you think the format in question would be worth implementing support for, you can open a feature request in https://bugs.kde.org/enter_bug.cgi?product=kig&bug_severity=wishlist\">KDE's bug tracking system</a>"
, mimeType->name()),
- i18n( "Format Not Supported" )
+ i18n( "Format Not Supported" ),
+ KMessageBox::Notify | KMessageBox::AllowLink
);
return false;
};
@@ -474,6 +471,19 @@
return true;
}
return false;
+}
+
+bool KigPart::queryClose()
+{
+ if ( KParts::ReadWritePart::queryClose() )
+ {
+ if ( mode()->eventLoop() != 0 )
+ {
+ cancelConstruction();
+ }
+ return true;
+ }
+ return false;
}
void KigPart::addObject(ObjectHolder* o)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kig-4.12.2/kig/kig_part.desktop new/kig-4.12.90/kig/kig_part.desktop
--- old/kig-4.12.2/kig/kig_part.desktop 2014-01-02 01:47:50.000000000 +0100
+++ new/kig-4.12.90/kig/kig_part.desktop 2014-02-13 22:57:45.000000000 +0100
@@ -66,7 +66,7 @@
Name[x-test]=xxKigPartxx
Name[zh_CN]=Kig 组件
Name[zh_TW]=KigPart
-MimeType=application/x-kig;application/x-kgeo;
+MimeType=application/x-kig;application/x-kgeo;image/x-xfig;application/x-cabri;application/x-drgeo;application/x-kseg;
X-KDE-ServiceTypes=KParts/ReadOnlyPart,KParts/ReadWritePart
X-KDE-Library=kigpart
Type=Service
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kig-4.12.2/kig/kig_part.h new/kig-4.12.90/kig/kig_part.h
--- old/kig-4.12.2/kig/kig_part.h 2014-01-02 01:47:50.000000000 +0100
+++ new/kig-4.12.90/kig/kig_part.h 2014-02-13 22:57:45.000000000 +0100
@@ -93,6 +93,13 @@
*/
virtual bool saveFile();
+ /**
+ * KigPart cannot be safely destroyed if it's in a nested event loop
+ * (construct mode). As a workaround, call this first so it can cancel the
+ * construction.
+ */
+ virtual bool queryClose();
+
public:
void emitStatusBarText( const QString& text );
void redrawScreen();
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kig-4.12.2/modes/mode.cc new/kig-4.12.90/modes/mode.cc
--- old/kig-4.12.2/modes/mode.cc 2014-01-02 01:47:50.000000000 +0100
+++ new/kig-4.12.90/modes/mode.cc 2014-02-13 22:57:45.000000000 +0100
@@ -45,7 +45,7 @@
}
KigMode::KigMode( KigPart& d )
- : mdoc( d )
+ : mdoc( d ), mevloop( 0 )
{
}
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org