[SCM] umbrello packaging branch, master, updated. debian/15.12.1-1-13-g4f96ada
Maximiliano Curia
maxy at moszumanska.debian.org
Thu May 26 16:30:06 UTC 2016
Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/umbrello.git;a=commitdiff;h=89a4d84
The following commit has been merged in the master branch:
commit 89a4d84306501ba5111fd52accbe7ea89524338e
Author: Automatic packaging <maxy+jenkins at gnuservers.com.ar>
Date: Wed Apr 13 11:37:11 2016 +0200
Refresh patches
---
debian/patches/QCOMPARE_uses_toString.patch | 51 -----------
debian/patches/fix_build.patch | 42 +++++----
debian/patches/valgrind_errors | 134 ----------------------------
3 files changed, 26 insertions(+), 201 deletions(-)
diff --git a/debian/patches/QCOMPARE_uses_toString.patch b/debian/patches/QCOMPARE_uses_toString.patch
deleted file mode 100644
index 16621ac..0000000
--- a/debian/patches/QCOMPARE_uses_toString.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-Index: umbrello/unittests/TEST_cppwriter.cpp
-===================================================================
---- umbrello.orig/unittests/TEST_cppwriter.cpp 2015-12-18 15:48:19.799152798 +0100
-+++ umbrello/unittests/TEST_cppwriter.cpp 2015-12-18 15:48:19.795152964 +0100
-@@ -41,7 +41,7 @@
- {
- CppWriter* cpp = new CppWriter();
- Uml::ProgrammingLanguage::Enum lang = cpp->language();
-- QCOMPARE(lang, Uml::ProgrammingLanguage::Cpp);
-+ // QCOMPARE(lang, Uml::ProgrammingLanguage::Cpp);
- }
-
- void TEST_cppwriter::test_writeClass()
-Index: umbrello/unittests/TEST_pythonwriter.cpp
-===================================================================
---- umbrello.orig/unittests/TEST_pythonwriter.cpp 2015-12-17 14:48:47.968565358 +0100
-+++ umbrello/unittests/TEST_pythonwriter.cpp 2015-12-18 16:00:49.832287762 +0100
-@@ -41,7 +41,7 @@
- {
- PythonWriter* py = new PythonWriter();
- Uml::ProgrammingLanguage::Enum lang = py->language();
-- QCOMPARE(lang, Uml::ProgrammingLanguage::Python);
-+ // QCOMPARE(lang, Uml::ProgrammingLanguage::Python);
- }
-
- void TEST_pythonwriter::test_writeClass()
-Index: umbrello/unittests/TEST_umlobject.cpp
-===================================================================
---- umbrello.orig/unittests/TEST_umlobject.cpp 2015-12-17 14:48:47.968565358 +0100
-+++ umbrello/unittests/TEST_umlobject.cpp 2015-12-18 16:01:34.230464741 +0100
-@@ -200,15 +200,15 @@
- void TEST_UMLObject::test_setVisibility()
- {
- UMLObject a("Test A");
-- QCOMPARE(a.visibility(), Uml::Visibility::Public);
-+ // QCOMPARE(a.visibility(), Uml::Visibility::Public);
- a.setVisibilityCmd(Uml::Visibility::Protected);
-- QCOMPARE(a.visibility(), Uml::Visibility::Protected);
-+ // QCOMPARE(a.visibility(), Uml::Visibility::Protected);
- a.setVisibilityCmd(Uml::Visibility::Private);
-- QCOMPARE(a.visibility(), Uml::Visibility::Private);
-+ // QCOMPARE(a.visibility(), Uml::Visibility::Private);
- a.setVisibilityCmd(Uml::Visibility::Implementation);
-- QCOMPARE(a.visibility(), Uml::Visibility::Implementation);
-+ // QCOMPARE(a.visibility(), Uml::Visibility::Implementation);
- a.setVisibilityCmd(Uml::Visibility::FromParent);
-- QCOMPARE(a.visibility(), Uml::Visibility::FromParent);
-+ // QCOMPARE(a.visibility(), Uml::Visibility::FromParent);
- }
-
- void TEST_UMLObject::test_toString()
diff --git a/debian/patches/fix_build.patch b/debian/patches/fix_build.patch
index 2fb4e7f..1c518d2 100644
--- a/debian/patches/fix_build.patch
+++ b/debian/patches/fix_build.patch
@@ -1,8 +1,30 @@
-Index: umbrello/umbrello/CMakeLists.txt
+From: Debian/Kubuntu Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
+Date: Wed, 13 Apr 2016 11:37:09 +0200
+Subject: fix_build
+
===================================================================
---- umbrello.orig/umbrello/CMakeLists.txt 2015-12-17 14:48:47.616579871 +0100
-+++ umbrello/umbrello/CMakeLists.txt 2015-12-17 22:16:08.902597723 +0100
-@@ -544,7 +544,7 @@
+---
+ CMakeLists.txt | 1 +
+ umbrello/CMakeLists.txt | 2 +-
+ 2 files changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 7743232..f24bd15 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -141,6 +141,7 @@ else()
+ KIO
+ TextEditor
+ WidgetsAddons
++ WindowSystem
+ XmlGui
+ )
+
+diff --git a/umbrello/CMakeLists.txt b/umbrello/CMakeLists.txt
+index 92b9b34..dffe251 100644
+--- a/umbrello/CMakeLists.txt
++++ b/umbrello/CMakeLists.txt
+@@ -544,7 +544,7 @@ else()
${CMAKE_CURRENT_SOURCE_DIR}/pics/global/hi128-apps-umbrello.png
)
add_executable(umbrello ${umbrello_SRCS})
@@ -11,15 +33,3 @@ Index: umbrello/umbrello/CMakeLists.txt
endif()
if(LIB_BUILD_MODE EQUAL SHARED)
install(TARGETS libumbrello ${INSTALL_TARGETS_DEFAULT_ARGS} )
-Index: umbrello/CMakeLists.txt
-===================================================================
---- umbrello.orig/CMakeLists.txt 2015-12-17 22:44:43.119662787 +0100
-+++ umbrello/CMakeLists.txt 2015-12-17 22:45:01.034920837 +0100
-@@ -141,6 +141,7 @@
- KIO
- TextEditor
- WidgetsAddons
-+ WindowSystem
- XmlGui
- )
-
diff --git a/debian/patches/valgrind_errors b/debian/patches/valgrind_errors
deleted file mode 100644
index 2aa8269..0000000
--- a/debian/patches/valgrind_errors
+++ /dev/null
@@ -1,134 +0,0 @@
-Index: umbrello/umbrello/widgets/classifierwidget.cpp
-===================================================================
---- umbrello.orig/umbrello/widgets/classifierwidget.cpp 2014-08-20 15:27:31.364568737 +0200
-+++ umbrello/umbrello/widgets/classifierwidget.cpp 2014-08-20 15:27:31.356569064 +0200
-@@ -46,25 +46,30 @@
- m_pAssocWidget(0), m_pInterfaceName(0)
- {
- const Settings::OptionState& ops = m_scene->optionState();
-- setVisualPropertyCmd(ShowVisibility, ops.classState.showVisibility);
-- setVisualPropertyCmd(ShowOperations, ops.classState.showOps);
-- setVisualPropertyCmd(ShowPublicOnly, ops.classState.showPublicOnly);
-- setVisualPropertyCmd(ShowPackage, ops.classState.showPackage);
-- m_attributeSignature = Uml::SignatureType::ShowSig;
-+ // valgrind issue:
-+ // Conditional jump or move depends on uninitialised value(s)
-+ // setVisualPropertyCmd(ShowVisibility, ops.classState.showVisibility);
-+ // uses m_operationSignature
- /*:TODO:
- setVisualProperty(ShowOperationSignature, ops.classState.showOpSig);
- Cannot do that because we get "pure virtual method called". Open code:
- */
- if(!ops.classState.showOpSig) {
-- if (visualProperty(ShowVisibility))
-+ if (ops.classState.showVisibility)
- m_operationSignature = Uml::SignatureType::NoSig;
- else
- m_operationSignature = Uml::SignatureType::NoSigNoVis;
-
-- } else if (visualProperty(ShowVisibility))
-+ } else if (ops.classState.showVisibility)
- m_operationSignature = Uml::SignatureType::ShowSig;
- else
- m_operationSignature = Uml::SignatureType::SigNoVis;
-+ m_attributeSignature = Uml::SignatureType::ShowSig;
-+
-+ setVisualPropertyCmd(ShowVisibility, ops.classState.showVisibility);
-+ setVisualPropertyCmd(ShowOperations, ops.classState.showOps);
-+ setVisualPropertyCmd(ShowPublicOnly, ops.classState.showPublicOnly);
-+ setVisualPropertyCmd(ShowPackage, ops.classState.showPackage);
-
- setVisualPropertyCmd(ShowAttributes, ops.classState.showAtts);
- setVisualPropertyCmd(ShowStereotype, ops.classState.showStereoType);
-Index: umbrello/umbrello/clipboard/umlclipboard.cpp
-===================================================================
---- umbrello.orig/umbrello/clipboard/umlclipboard.cpp 2014-08-20 15:27:31.364568737 +0200
-+++ umbrello/umbrello/clipboard/umlclipboard.cpp 2014-08-20 15:27:31.360568901 +0200
-@@ -475,8 +475,15 @@
- UMLScene *currentScene = UMLApp::app()->currentView()->umlScene();
- if(diagramType != currentScene->type()) {
- if(!checkPasteWidgets(widgets)) {
-+ // valgrind error
- while (!assocs.isEmpty()) {
-- delete assocs.takeFirst();
-+ AssociationWidget *assoc = assocs.takeFirst();
-+ currentScene->removeAssocInViewAndDoc(assoc);
-+ }
-+ while (!widgets.isEmpty()) {
-+ UMLWidget *widget = widgets.takeFirst();
-+ currentScene->removeWidget(widget);
-+ delete widget;
- }
- return false;
- }
-@@ -708,17 +715,22 @@
- {
- FloatingTextWidget *ft = static_cast<FloatingTextWidget*>(p);
- if (ft->textRole() != Uml::TextRole::Floating) {
-- widgetList.removeAll(p);
-- delete ft;
-- retval = false;
-+ // valgrind error
-+ // segfault after a failed paste and then try to select an
-+ // area
-+ // widgetList.removeAll(p);
-+ // delete ft;
-+ return false;
- }
- }
- break;
-
- default:
-- widgetList.removeAll(p);
-- delete p;
-- retval = false;
-+ // valgrind error
-+ // segfault after a failed paste and then try to select an area
-+ // widgetList.removeAll(p);
-+ // delete p;
-+ return false;
- break;
- }
- }
-Index: umbrello/umbrello/umlscene.cpp
-===================================================================
---- umbrello.orig/umbrello/umlscene.cpp 2014-08-20 15:27:31.364568737 +0200
-+++ umbrello/umbrello/umlscene.cpp 2014-08-20 15:29:39.495338534 +0200
-@@ -1244,9 +1244,8 @@
- disconnect(this, SIGNAL(sigTextColorChanged(Uml::ID::Type)), o, SLOT(slotTextColorChanged(Uml::ID::Type)));
- if (t == WidgetBase::wt_Message) {
- m_MessageList.removeAll(static_cast<MessageWidget*>(o));
-- } else {
-- m_WidgetList.removeAll(o);
- }
-+ m_WidgetList.removeAll(o);
- o->deleteLater();
- m_doc->setModified(true);
- }
-Index: umbrello/umbrello/widgets/associationwidget.cpp
-===================================================================
---- umbrello.orig/umbrello/widgets/associationwidget.cpp 2014-08-20 15:27:31.364568737 +0200
-+++ umbrello/umbrello/widgets/associationwidget.cpp 2014-08-20 15:27:31.364568737 +0200
-@@ -1061,7 +1061,8 @@
- ft->setLink(this);
- ft->activate();
- setTextPosition(role);
-- m_scene->addFloatingTextWidget(ft);
-+ // segfault on click after removing the assoc
-+ // m_scene->addFloatingTextWidget(ft);
- } else {
- bool newLabel = ft->text().isEmpty();
- ft->setText(text);
-@@ -4254,7 +4255,12 @@
- }
- }
-
-+ // Wait till be have the complete object loaded to propagate
-+ // signals and sync to model.
-+ UMLAssociation *uml = association();
-+ uml && uml->blockSignals(true);
- setAssociationType(aType);
-+ uml && uml->blockSignals(false);
-
- QString indexa = qElement.attribute(QLatin1String("indexa"), QLatin1String("0"));
- QString indexb = qElement.attribute(QLatin1String("indexb"), QLatin1String("0"));
--
umbrello packaging
More information about the pkg-kde-commits
mailing list