[SCM] iannix/master: Refreshed patches
umlaeute at users.alioth.debian.org
umlaeute at users.alioth.debian.org
Mon Oct 23 11:15:48 UTC 2017
The following commit has been merged in the master branch:
commit 8e1522b072604d74323bd036f8e7e8a629b5e760
Author: IOhannes m zmölnig (Debian/GNU) <umlaeute at debian.org>
Date: Mon Oct 23 13:03:33 2017 +0200
Refreshed patches
and removed those applied upstream
diff --git a/debian/patches/fix_spelling_errors.patch b/debian/patches/fix_spelling_errors.patch
index 392457f..b04d418 100644
--- a/debian/patches/fix_spelling_errors.patch
+++ b/debian/patches/fix_spelling_errors.patch
@@ -4,88 +4,6 @@ Bug: https://github.com/buzzinglight/IanniX/pull/25
Last-Update: 2017-05-19
---
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- iannix.orig/Tools/Translation_fr_FR.ts
-+++ iannix/Tools/Translation_fr_FR.ts
-@@ -440,7 +440,7 @@
- <location filename="../iannix.cpp" line="490"/>
- <location filename="../iannix.cpp" line="501"/>
- <location filename="../iannix.cpp" line="531"/>
-- <source>Coordinates systems are differents.
-+ <source>Coordinates systems are different.
- Please enter a scale factor: </source>
- <translation>Les systèmes de coordonnées sont différents.
- Merci de saisir un facteur de taille :</translation>
---- iannix.orig/geometry/qmuparser/muParserError.cpp
-+++ iannix/geometry/qmuparser/muParserError.cpp
-@@ -97,7 +97,7 @@
- m_vErrMsg[ecSTR_RESULT] = _T("Function result is a string.");
- m_vErrMsg[ecGENERIC] = _T("Parser error.");
- m_vErrMsg[ecLOCALE] = _T("Decimal separator is identic to function argument separator.");
-- m_vErrMsg[ecUNEXPECTED_CONDITIONAL] = _T("The \"$TOK$\" operator must be preceeded by a closing bracket.");
-+ m_vErrMsg[ecUNEXPECTED_CONDITIONAL] = _T("The \"$TOK$\" operator must be preceded by a closing bracket.");
- m_vErrMsg[ecMISSING_ELSE_CLAUSE] = _T("If-then-else operator is missing an else clause");
- m_vErrMsg[ecMISPLACED_COLON] = _T("Misplaced colon at position $POS$");
- m_vErrMsg[ecUNREASONABLE_NUMBER_OF_COMPUTATIONS] = _T("Number of computations to small for bulk mode. (Vectorisation overhead too costly)");
---- iannix.orig/gui/uiinspector.ui
-+++ iannix/gui/uiinspector.ui
-@@ -695,7 +695,7 @@
- <item>
- <widget class="QWidget" name="widgetStyle" native="true">
- <property name="statusTip">
-- <string>Objects style|Objects can have differents graphical behaviours:\n - you can change the colors and texture (images - only for triggers)\n - size or thickness of the object is customisable\n - a label can be set to add human readable information to the object</string>
-+ <string>Objects style|Objects can have different graphical behaviours:\n - you can change the colors and texture (images - only for triggers)\n - size or thickness of the object is customisable\n - a label can be set to add human readable information to the object</string>
- </property>
- <layout class="QVBoxLayout" name="verticalLayout_12">
- <property name="spacing">
-@@ -1072,7 +1072,7 @@
- </size>
- </property>
- <property name="toolTip">
-- <string>Multiplies the color of objects by an other color in the palette or a custom color</string>
-+ <string>Multiplies the color of objects by another color in the palette or a custom color</string>
- </property>
- <property name="styleSheet">
- <string notr="true">QComboBox QAbstractItemView {
-@@ -1274,7 +1274,7 @@
- </widget>
- <widget class="QWidget" name="ssTabInfoSpace">
- <property name="statusTip">
-- <string>Objects and 3D space|Objects are positionned in a 3D space. These options allows you to control how objects interact with space:\n - absolute position\n - size of curves\n - playhead cursor size\n - curve trajectory points (manual or mathematical edition)</string>
-+ <string>Objects and 3D space|Objects are positioned in a 3D space. These options allows you to control how objects interact with space:\n - absolute position\n - size of curves\n - playhead cursor size\n - curve trajectory points (manual or mathematical edition)</string>
- </property>
- <attribute name="title">
- <string>3D SPACE</string>
-@@ -3376,7 +3376,7 @@
- <string>Changes the amount of messages sent by objects (small values may be CPU and network intensive)</string>
- </property>
- <property name="specialValueText">
-- <string>Messages are sent immediatly</string>
-+ <string>Messages are sent immediately</string>
- </property>
- <property name="prefix">
- <string>Messages are sent each </string>
-@@ -4264,10 +4264,10 @@
- </widget>
- <widget class="QWidget" name="ssTabRessource">
- <property name="statusTip">
-- <string>Score ressources|These two lists allows you to add external file (image file for triggers appearance or score background) or to create a color palette for your score. Each ressource is identified by a unique string. Once edited, your new ressources will be available in the first tab if you want to apply them on objects.</string>
-+ <string>Score resources|These two lists allows you to add external file (image file for triggers appearance or score background) or to create a color palette for your score. Each resource is identified by a unique string. Once edited, your new resources will be available in the first tab if you want to apply them on objects.</string>
- </property>
- <attribute name="title">
-- <string>RESSOURCES</string>
-+ <string>RESOURCES</string>
- </attribute>
- <layout class="QVBoxLayout" name="verticalLayout_14">
- <property name="spacing">
-@@ -4583,7 +4583,7 @@
- </size>
- </property>
- <property name="toolTip">
-- <string>Camera point of view can be controled by an object. Type here the ID of this object.</string>
-+ <string>Camera point of view can be controlled by an object. Type here the ID of this object.</string>
- </property>
- <property name="specialValueText">
- <string>no objects</string>
--- iannix.orig/gui/uiview.ui
+++ iannix/gui/uiview.ui
@@ -1373,7 +1373,7 @@
@@ -97,66 +15,9 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
</property>
<property name="shortcutContext">
<enum>Qt::ApplicationShortcut</enum>
-@@ -1384,10 +1384,10 @@
- <string>Import text…</string>
- </property>
- <property name="toolTip">
-- <string>Imports glyphes (characters) to score</string>
-+ <string>Imports glyphs (characters) to score</string>
- </property>
- <property name="statusTip">
-- <string>Text import|IanniX can import glyphes (characters) from fonts. Note that font sizes are based on print or display units whereas IanniX is based on seconds; you may need to rescale the imported data.</string>
-+ <string>Text import|IanniX can import glyphs (characters) from fonts. Note that font sizes are based on print or display units whereas IanniX is based on seconds; you may need to rescale the imported data.</string>
- </property>
- <property name="shortcutContext">
- <enum>Qt::ApplicationShortcut</enum>
---- iannix.orig/iannixapp.cpp
-+++ iannix/iannixapp.cpp
-@@ -103,7 +103,7 @@
- if(Application::pathApplication.absoluteFilePath().endsWith("/IanniX-build"))
- Application::pathApplication = QFileInfo(Application::pathApplication.absoluteFilePath().remove("-build"));
-
-- qDebug("Pathes");
-+ qDebug("Paths");
- qDebug("\tDocuments : %s", qPrintable(Application::pathDocuments .absoluteFilePath()));
- qDebug("\tApplication: %s", qPrintable(Application::pathApplication.absoluteFilePath()));
- qDebug("\tCurrent : %s", qPrintable(Application::pathCurrent .absoluteFilePath()));
---- iannix.orig/interfaces/interfaceserial.ui
-+++ iannix/interfaces/interfaceserial.ui
-@@ -69,7 +69,7 @@
- </size>
- </property>
- <property name="toolTip">
-- <string>Opens the folder where you can find examples of IanniX interfacing with softwares using serial port</string>
-+ <string>Opens the folder where you can find examples of IanniX interfacing with software using serial port</string>
- </property>
- <property name="text">
- <string>OPEN EXAMPLES</string>
---- iannix.orig/interfaces/interfacetcp.ui
-+++ iannix/interfaces/interfacetcp.ui
-@@ -69,7 +69,7 @@
- </size>
- </property>
- <property name="toolTip">
-- <string>Opens the folder where you can find examples of IanniX interfacing with softwares using TCP/XML</string>
-+ <string>Opens the folder where you can find examples of IanniX interfacing with software using TCP/XML</string>
- </property>
- <property name="text">
- <string>OPEN EXAMPLES</string>
---- iannix.orig/interfaces/interfaceudp.ui
-+++ iannix/interfaces/interfaceudp.ui
-@@ -69,7 +69,7 @@
- </size>
- </property>
- <property name="toolTip">
-- <string>Opens the folder where you can find examples of IanniX interfacing with softwares using raw UDP</string>
-+ <string>Opens the folder where you can find examples of IanniX interfacing with software using raw UDP</string>
- </property>
- <property name="text">
- <string>OPEN EXAMPLES</string>
--- iannix.orig/objects/nxcursor.cpp
+++ iannix/objects/nxcursor.cpp
-@@ -162,7 +162,7 @@
+@@ -163,7 +163,7 @@
time = time / curve->getPathLength() * fakeCurveLength + timeStartOffsetReal / curve->getPathLength();
}
diff --git a/debian/patches/qreal-not-double.patch b/debian/patches/qreal-not-double.patch
deleted file mode 100644
index 94f4266..0000000
--- a/debian/patches/qreal-not-double.patch
+++ /dev/null
@@ -1,115 +0,0 @@
-Description: allow (qreal) to not be (double)
- On arm-archs, qreal has traditionally been (float).
- This patch allows compilation on such systems.
-Author: IOhannes m zmölnig
-Forwarded: https://github.com/buzzinglight/IanniX/pull/27
-Applied-Upstream: ff85e8b9054ce676924d045dd974333b2fbd52d0
-Last-Update: 2017-06-05
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- iannix.orig/abstractionsgl.cpp
-+++ iannix/abstractionsgl.cpp
-@@ -503,8 +503,8 @@
- }
- void OpenGlDrawing::drawRect(const QRectF &rect, const OpenGlColors &colors, OpenGlTexture *texture, qreal alpha, qreal selected, qreal croppingMode, bool ninePatch, QRectF partialTextureRect) {
- QRectF textureRect, targetRect = rect;
-- alpha = qBound(0., alpha, 1.);
-- selected = qBound(0., selected, 1.);
-+ alpha = qBound(qreal(0.), alpha, qreal(1.));
-+ selected = qBound(qreal(0.), selected, qreal(1.));
-
- //Cropping
- if(!colors.isColorTransparent()) {
-@@ -716,7 +716,7 @@
- //painter->drawStaticText(QPointF(0, 0), staticText);
- //qDebug("%s\tH:%f\tC:%f\tSH:%f\tPOS:%f", qPrintable(text), rect.height(), rect.center().y(), staticText.size().height(), rect.center().y() - staticText.size().height()/2);
- if((font.alignementFlags() & Qt::AlignVCenter) == Qt::AlignVCenter)
-- pos.setY(qMax(0., rect.center().y() - fontHeight/2));
-+ pos.setY(qMax(qreal(0.), rect.center().y() - fontHeight/2));
- else if((font.alignementFlags() & Qt::AlignBottom) == Qt::AlignBottom)
- pos.setY(rect.bottom() - fontHeight);
-
---- iannix.orig/geometry/nxeasing.h
-+++ iannix/geometry/nxeasing.h
-@@ -38,7 +38,7 @@
- public:
- inline void setType(quint16 type) { easing.setType((QEasingCurve::Type)type); }
- inline quint16 getType() const { return easing.type(); }
-- inline qreal getValue(qreal progress) const { return qBound(0., easing.valueForProgress(progress), 1.); }
-+ inline qreal getValue(qreal progress) const { return qBound(qreal(0.), easing.valueForProgress(progress), qreal(1.)); }
- };
-
- #endif // NXEASING_H
---- iannix.orig/geometry/qmuparser/muParserDef.h
-+++ iannix/geometry/qmuparser/muParserDef.h
-@@ -49,7 +49,9 @@
- This datatype must be a built in value type. You can not use custom classes.
- It should be working with all types except "int"!
- */
--#define MUP_BASETYPE double
-+#ifndef MUP_BASETYPE
-+# define MUP_BASETYPE double
-+#endif /* MUP_BASETYPE */
-
- /** \brief Activate this option in order to compile with OpenMP support.
-
---- iannix.orig/objects/nxcursor.cpp
-+++ iannix/objects/nxcursor.cpp
-@@ -290,10 +290,10 @@
- else if(Render::colors->contains(colorInactive)) color = Render::colors->value(colorInactive);
- else color = Qt::gray;
- }
-- color.setRgb (qBound(0., color.red() * colorMultiplyColor.redF(), 255.),
-- qBound(0., color.green() * colorMultiplyColor.greenF(), 255.),
-- qBound(0., color.blue() * colorMultiplyColor.blueF(), 255.),
-- qBound(0., color.alpha() * colorMultiplyColor.alphaF(), 255.));
-+ color.setRgb (qBound(qreal(0.), color.red() * colorMultiplyColor.redF(), qreal(255.)),
-+ qBound(qreal(0.), color.green() * colorMultiplyColor.greenF(), qreal(255.)),
-+ qBound(qreal(0.), color.blue() * colorMultiplyColor.blueF(), qreal(255.)),
-+ qBound(qreal(0.), color.alpha() * colorMultiplyColor.alphaF(), qreal(255.)));
-
- if(color.alpha() > 0) {
- //Mouse hover
-@@ -408,7 +408,7 @@
- glRotatef(cursorAngle.z(), 0, 0, 1);
- glRotatef(cursorAngle.y(), 0, 1, 0);
- glRotatef(cursorAngle.x(), 1, 0, 0);
-- qreal size2 = Render::objectSize / 2 * qMin(1., width);
-+ qreal size2 = Render::objectSize / 2 * qMin(qreal(1.), width);
- glBegin(GL_TRIANGLE_FAN);
- glLineWidth(2);
- if(hasActivity) {
---- iannix.orig/objects/nxcurve.cpp
-+++ iannix/objects/nxcurve.cpp
-@@ -155,10 +155,10 @@
- else if(Render::colors->contains(colorInactive)) color = Render::colors->value(colorInactive);
- else color = Qt::gray;
- }
-- color.setRgb (qBound(0., color.red() * colorMultiplyColor.redF(), 255.),
-- qBound(0., color.green() * colorMultiplyColor.greenF(), 255.),
-- qBound(0., color.blue() * colorMultiplyColor.blueF(), 255.),
-- qBound(0., color.alpha() * colorMultiplyColor.alphaF(), 255.));
-+ color.setRgb (qBound(qreal(0.), color.red() * colorMultiplyColor.redF(), qreal(255.)),
-+ qBound(qreal(0.), color.green() * colorMultiplyColor.greenF(), qreal(255.)),
-+ qBound(qreal(0.), color.blue() * colorMultiplyColor.blueF(), qreal(255.)),
-+ qBound(qreal(0.), color.alpha() * colorMultiplyColor.alphaF(), qreal(255.)));
-
- if(color.alpha() > 0) {
- //Mouse hover
---- iannix.orig/objects/nxtrigger.cpp
-+++ iannix/objects/nxtrigger.cpp
-@@ -61,10 +61,10 @@
- else if(Render::colors->contains(colorInactive)) color = Render::colors->value(colorInactive);
- else color = Qt::gray;
- }
-- color.setRgb (qBound(0., color.red() * colorMultiplyColor.redF(), 255.),
-- qBound(0., color.green() * colorMultiplyColor.greenF(), 255.),
-- qBound(0., color.blue() * colorMultiplyColor.blueF(), 255.),
-- qBound(0., color.alpha() * colorMultiplyColor.alphaF(), 255.));
-+ color.setRgb (qBound(qreal(0.), color.red() * colorMultiplyColor.redF(), qreal(255.)),
-+ qBound(qreal(0.), color.green() * colorMultiplyColor.greenF(), qreal(255.)),
-+ qBound(qreal(0.), color.blue() * colorMultiplyColor.blueF(), qreal(255.)),
-+ qBound(qreal(0.), color.alpha() * colorMultiplyColor.alphaF(), qreal(255.)));
-
- //Size of trigger
- if(cacheSize != Render::objectSize*size) {
diff --git a/debian/patches/series b/debian/patches/series
index ab9c7b2..76b1ce8 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
fix_spelling_errors.patch
-qreal-not-double.patch
debian_resources_path.patch
debian_privacy.patch
--
iannix packaging
More information about the pkg-multimedia-commits
mailing list