[pkg-xtuple-maintainers] [openrpt] 04/04: Remove patches applied upstream
Daniel Pocock
pocock at moszumanska.debian.org
Mon Sep 22 06:52:28 UTC 2014
This is an automated email from the git hooks/post-receive script.
pocock pushed a commit to branch debian-experimental
in repository openrpt.
commit a775e76625d7f73fd21a9135e471ef05a30cdf23
Author: Daniel Pocock <daniel at pocock.pro>
Date: Mon Sep 22 07:56:28 2014 +0200
Remove patches applied upstream
---
debian/patches/01-use-system-dmtx.patch | 54 ---------------
debian/patches/02-01-a39adeacf901.patch | 19 -----
debian/patches/02-02-4a02ded503ab.patch | 19 -----
debian/patches/02-03-513be82ce4eb.patch | 19 -----
debian/patches/03-qbound-arm.patch | 67 ------------------
debian/patches/04-dynamic-library.patch | 118 --------------------------------
debian/patches/series | 6 --
debian/rules | 7 +-
8 files changed, 5 insertions(+), 304 deletions(-)
diff --git a/debian/patches/01-use-system-dmtx.patch b/debian/patches/01-use-system-dmtx.patch
deleted file mode 100644
index ff98c64..0000000
--- a/debian/patches/01-use-system-dmtx.patch
+++ /dev/null
@@ -1,54 +0,0 @@
---- a/OpenRPT/renderapp/renderapp.pro
-+++ b/OpenRPT/renderapp/renderapp.pro
-@@ -31,7 +31,7 @@
- MOC_DIR = tmp
- UI_DIR = tmp
-
--LIBS += -L../../lib -lrenderer -lcommon -lDmtx_Library
-+LIBS += -L../../lib -lrenderer -lcommon -ldmtx
-
- win32-msvc* {
- PRE_TARGETDEPS += ../../lib/common.lib \
---- a/OpenRPT/renderer/renderer.pro
-+++ b/OpenRPT/renderer/renderer.pro
-@@ -29,7 +29,7 @@
- OBJECTS_DIR = tmp
- UI_DIR = tmp
-
--LIBS += -L../../lib -lDmtx_Library
-+LIBS += -L../../lib -ldmtx
-
- HEADERS = openreports.h \
- barcodes.h \
---- a/OpenRPT/writer/writer.pro
-+++ b/OpenRPT/writer/writer.pro
-@@ -32,7 +32,7 @@
- OBJECTS_DIR = tmp
-
- INCLUDEPATH += ../../common ../common ../images
--LIBS += -L../../lib -lwrtembed -lcommon -lrenderer -lDmtx_Library
-+LIBS += -L../../lib -lwrtembed -lcommon -lrenderer -ldmtx
-
- win32-msvc* {
- PRE_TARGETDEPS += ../../lib/wrtembed.lib \
---- a/OpenRPT/wrtembed/wrtembed.pro
-+++ b/OpenRPT/wrtembed/wrtembed.pro
-@@ -32,7 +32,7 @@
- QT += xml sql
- #VERSION = 0.1.0
-
--LIBS += -L../../lib -lDmtx_Library
-+LIBS += -L../../lib -ldmtx
-
- #The following line was changed from FORMS to FORMS3 by qt3to4
- FORMS += labeleditor.ui \
---- a/openrpt.pro
-+++ b/openrpt.pro
-@@ -24,7 +24,6 @@
- MetaSQL \
- MetaSQL/metasql_gui \
- MetaSQL/importmql_gui \
-- OpenRPT/Dmtx_Library \
- OpenRPT/renderer \
- OpenRPT/wrtembed \
- OpenRPT/writer \
diff --git a/debian/patches/02-01-a39adeacf901.patch b/debian/patches/02-01-a39adeacf901.patch
deleted file mode 100644
index acc55f3..0000000
--- a/debian/patches/02-01-a39adeacf901.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-From: idiallo <idiallo>
-Git-Commit-Id: a39adeacf901
-Date: 2013-04-19 20:18 +0000
-Subject: Incident #16462: problem with the calculation of page jumps for Text (multi-lines) items.
-
-git-svn-id: http://svn.code.sf.net/p/postbooks/code/openrpt/trunk@14579 ea1a15ef-c238-0410-93cb-fa28e9f07733
-
-diff --git a/OpenRPT/renderer/orprerender.cpp b/OpenRPT/renderer/orprerender.cpp
---- a/OpenRPT/renderer/orprerender.cpp
-+++ b/OpenRPT/renderer/orprerender.cpp
-@@ -1123,7 +1123,7 @@ qreal ORPreRenderPrivate::renderSection(
- int intRectWidth = (int)(trf.width() * prnt.logicalDpiX()) - CLIPMARGIN;
- int l = (_detailQuery ? _detailQuery->at() : 0);
- int qs = (_detailQuery ? _detailQuery->size() : 1);
-- int sizeLimit = _maxHeight - _bottomMargin;
-+ qreal sizeLimit = _maxHeight - _bottomMargin;
- if(!_subtotContextPageFooter)
- sizeLimit = _maxHeight - _bottomMargin - finishCurPageSize((l+1 == qs));
-
diff --git a/debian/patches/02-02-4a02ded503ab.patch b/debian/patches/02-02-4a02ded503ab.patch
deleted file mode 100644
index b09c737..0000000
--- a/debian/patches/02-02-4a02ded503ab.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-From: idiallo <idiallo>
-Git-Commit-Id: 4a02ded503ab
-Date: 2013-04-26 12:14 +0000
-Subject: Fix for issue #19706 (revision 14488) : bad drag behaviour when "snap to grid" is disabled.
-
-git-svn-id: http://svn.code.sf.net/p/postbooks/code/openrpt/trunk@14589 ea1a15ef-c238-0410-93cb-fa28e9f07733
-
-diff --git a/OpenRPT/wrtembed/graphicsitems.cpp b/OpenRPT/wrtembed/graphicsitems.cpp
---- a/OpenRPT/wrtembed/graphicsitems.cpp
-+++ b/OpenRPT/wrtembed/graphicsitems.cpp
-@@ -186,7 +186,7 @@ void ORResizeHandle::mouseMoveEvent(QGra
- if(ds)
- {
- rgo = ds->gridOptions();
-- if(rgo) {
-+ if(rgo && rgo->isSnap()) {
- scenePos = rgo->snapPoint(scenePos);
- lastScenePos = rgo->snapPoint(lastScenePos);
- scalX = 100 * rgo->xInterval();
diff --git a/debian/patches/02-03-513be82ce4eb.patch b/debian/patches/02-03-513be82ce4eb.patch
deleted file mode 100644
index 98bd1a2..0000000
--- a/debian/patches/02-03-513be82ce4eb.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-From: idiallo <idiallo>
-Git-Commit-Id: 513be82ce4eb
-Date: 2013-05-06 23:00 +0000
-Subject: Issue #20285: Selecting 'Move Down' button in section editor screen crashes the application.
-
-git-svn-id: http://svn.code.sf.net/p/postbooks/code/openrpt/trunk@14605 ea1a15ef-c238-0410-93cb-fa28e9f07733
-
-diff --git a/OpenRPT/wrtembed/sectioneditor.cpp b/OpenRPT/wrtembed/sectioneditor.cpp
---- a/OpenRPT/wrtembed/sectioneditor.cpp
-+++ b/OpenRPT/wrtembed/sectioneditor.cpp
-@@ -181,7 +181,7 @@ void SectionEditor::brnMoveDown_clicked(
- {
- // get the selectged item and move it down in the list
- int idx = lbSections->currentRow();
-- if(idx == (int)(lbSections->count() - 1))
-+ if(idx < 0 || idx == (int)(lbSections->count() - 1))
- return;
- QString s = lbSections->item(idx)->text();
- lbSections->takeItem(idx);
diff --git a/debian/patches/03-qbound-arm.patch b/debian/patches/03-qbound-arm.patch
deleted file mode 100644
index 563b8c2..0000000
--- a/debian/patches/03-qbound-arm.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-From: Andrew Shadura <andrewsh at debian.org>
-Subject: Use proper types when calling qBound.
-
-qBound is a template function defined as:
-
- const T &qBound (const T &min, const T &value, const T &max )
-
-On ARM, for some reason the type of min and max in this expression
-resolves to double, and compiler fails to find a function matching
-qBound(double, qreal, double). For that reason we typecast constants
-to qreal explicitly.
-
---- a/OpenRPT/renderer/satopaintengine.cpp
-+++ b/OpenRPT/renderer/satopaintengine.cpp
-@@ -221,7 +221,7 @@
- else if(format.contains("datamatrix"))
- {
- DmtxInfos dmtxInfos = extractInfosDtmx(format);
-- int eltSize = qRound (qBound(2.0, (qreal)height / (qreal)dmtxInfos.ySize, 20.0));
-+ int eltSize = qRound (qBound((qreal)2.0, (qreal)height / (qreal)dmtxInfos.ySize, (qreal)20.0));
- barcodeFont = QString("BX0620%1%2%3%4")
- .arg(eltSize,2,10,QLatin1Char('0'))
- .arg(eltSize,2,10,QLatin1Char('0'))
---- a/OpenRPT/renderer/zebrapaintengine.cpp
-+++ b/OpenRPT/renderer/zebrapaintengine.cpp
-@@ -148,7 +148,7 @@
- else if(format.contains("datamatrix"))
- {
- DmtxInfos dmtxInfos = extractInfosDtmx(format);
-- int eltSize = qRound (qBound(2.0, (qreal)height / (qreal)dmtxInfos.ySize, 20.0));
-+ int eltSize = qRound (qBound((qreal)2.0, (qreal)height / (qreal)dmtxInfos.ySize, (qreal)20.0));
- barcodeFont = QString("BX,%1,200,%2,%3").arg(eltSize).arg(dmtxInfos.xSize).arg(dmtxInfos.ySize);
- }
- else {
---- a/OpenRPT/wrtembed/graphicsitems.cpp
-+++ b/OpenRPT/wrtembed/graphicsitems.cpp
-@@ -3245,7 +3245,7 @@
- // Populate Table query properties
- {
- // Margins
-- qreal l, r, t, b;
-+ double l, r, t, b;
- cellMargins(l, r, t, b);
- le->m_cellLeftMarginDoubleSpinBox->setValue(l);
- le->m_cellRightMarginDoubleSpinBox->setValue(r);
---- a/OpenRPT/wrtembed/graphicssection.cpp
-+++ b/OpenRPT/wrtembed/graphicssection.cpp
-@@ -51,7 +51,7 @@
- }
- }
-
-- setPos(pos().x(), qMax(mapToParent(mapFromScene(scenePos)).y(), 0.0));
-+ setPos(pos().x(), qMax(mapToParent(mapFromScene(scenePos)).y(), (qreal)0.0));
- }
-
- void ORSectionHandle::mousePressEvent(QGraphicsSceneMouseEvent * /*event*/)
-@@ -67,8 +67,8 @@
- // When the mouse is released we want to resize our parent to have
- // a new height according to the position we ended up at
- ORGraphicsSectionItem * sec = static_cast<ORGraphicsSectionItem*>(parentItem());
-- bool changed = (sec->rect().height() != qMax(pos().y(), 0.0));
-- sec->setRect(0, 0, sec->rect().width(), qMax(pos().y(), 0.0));
-+ bool changed = (sec->rect().height() != qMax(pos().y(), (qreal)0.0));
-+ sec->setRect(0, 0, sec->rect().width(), qMax(pos().y(), (qreal)0.0));
- DocumentScene * ds = static_cast<DocumentScene*>(sec->scene());
- if(ds)
- {
diff --git a/debian/patches/04-dynamic-library.patch b/debian/patches/04-dynamic-library.patch
deleted file mode 100644
index eebf52d..0000000
--- a/debian/patches/04-dynamic-library.patch
+++ /dev/null
@@ -1,118 +0,0 @@
-Link dynamically.
-
---- a/common/common.pro
-+++ b/common/common.pro
-@@ -21,7 +21,7 @@
- include( ../global.pri )
-
- TEMPLATE = lib
--CONFIG += qt warn_on staticlib
-+CONFIG += qt warn_on dll
- QT += xml sql
- DEFINES += MAKELIB
-
---- a/OpenRPT/renderapp/renderapp.pro
-+++ b/OpenRPT/renderapp/renderapp.pro
-@@ -37,8 +37,8 @@
- PRE_TARGETDEPS += ../../lib/common.lib \
- ../../lib/renderer.lib
- } else {
-- PRE_TARGETDEPS += ../../lib/libcommon.a \
-- ../../lib/librenderer.a
-+ PRE_TARGETDEPS += ../../lib/libcommon.so \
-+ ../../lib/librenderer.so
- }
-
- DESTDIR = ../../bin
---- a/OpenRPT/writer/writer.pro
-+++ b/OpenRPT/writer/writer.pro
-@@ -39,9 +39,9 @@
- ../../lib/common.lib \
- ../../lib/renderer.lib
- } else {
-- PRE_TARGETDEPS += ../../lib/libwrtembed.a \
-- ../../lib/libcommon.a \
-- ../../lib/librenderer.a
-+ PRE_TARGETDEPS += ../../lib/libwrtembed.so \
-+ ../../lib/libcommon.so \
-+ ../../lib/librenderer.so
- }
-
- RC_FILE = writer.rc
---- a/OpenRPT/renderer/renderer.pro
-+++ b/OpenRPT/renderer/renderer.pro
-@@ -21,7 +21,7 @@
- include( ../../global.pri )
-
- TEMPLATE = lib
--CONFIG += qt warn_on staticlib
-+CONFIG += qt warn_on dll
- DEFINES += MAKELIB
-
- DESTDIR = ../../lib
---- a/OpenRPT/wrtembed/wrtembed.pro
-+++ b/OpenRPT/wrtembed/wrtembed.pro
-@@ -21,7 +21,7 @@
- include( ../../global.pri )
-
- TEMPLATE = lib
--CONFIG += qt warn_on staticlib
-+CONFIG += qt warn_on dll
-
- INCLUDEPATH = ../../common ../common ../../../openrpt-build-desktop/common ../renderer ../images .
-
---- a/OpenRPT/import/import.pro
-+++ b/OpenRPT/import/import.pro
-@@ -39,7 +39,7 @@
- win32-msvc* {
- PRE_TARGETDEPS += ../../lib/common.lib
- } else {
-- PRE_TARGETDEPS += ../../lib/libcommon.a
-+ PRE_TARGETDEPS += ../../lib/libcommon.so
- }
-
- QT += xml sql
---- a/OpenRPT/import_gui/import_gui.pro
-+++ b/OpenRPT/import_gui/import_gui.pro
-@@ -35,7 +35,7 @@
- win32-msvc* {
- PRE_TARGETDEPS += ../../lib/common.lib
- } else {
-- PRE_TARGETDEPS += ../../lib/libcommon.a
-+ PRE_TARGETDEPS += ../../lib/libcommon.so
- }
-
- DESTDIR = ../../bin
---- a/OpenRPT/export/export.pro
-+++ b/OpenRPT/export/export.pro
-@@ -41,7 +41,7 @@
- win32-msvc* {
- PRE_TARGETDEPS += ../../lib/common.lib
- } else {
-- PRE_TARGETDEPS += ../../lib/libcommon.a
-+ PRE_TARGETDEPS += ../../lib/libcommon.so
- }
-
- QT += xml sql
---- a/MetaSQL/metasql_gui/metasql_gui.pro
-+++ b/MetaSQL/metasql_gui/metasql_gui.pro
-@@ -45,6 +45,6 @@
- PRE_TARGETDEPS += ../../lib/MetaSQL.lib \
- ../../lib/common.lib
- } else {
-- PRE_TARGETDEPS += ../../lib/libMetaSQL.a \
-- ../../lib/libcommon.a
-+ PRE_TARGETDEPS += ../../lib/libMetaSQL.so \
-+ ../../lib/libcommon.so
- }
---- a/MetaSQL/MetaSQL.pro
-+++ b/MetaSQL/MetaSQL.pro
-@@ -21,7 +21,7 @@
- include( ../global.pri )
-
- TEMPLATE = lib
--CONFIG += qt warn_on staticlib
-+CONFIG += qt warn_on dll
- QT += sql xml
- DEFINES += MAKELIB
-
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 6edd191..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,6 +0,0 @@
-01-use-system-dmtx.patch
-02-01-a39adeacf901.patch
-02-02-4a02ded503ab.patch
-02-03-513be82ce4eb.patch
-03-qbound-arm.patch
-04-dynamic-library.patch
diff --git a/debian/rules b/debian/rules
index 95907fc..3c85938 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,6 +2,9 @@
include /usr/share/dpkg/architecture.mk
+# this tells OpenRPT's build system not to build its own copy of libdmtx
+export USE_SYSTEM_DMTX=1
+
%:
dh $@ --builddirectory=. --parallel
@@ -13,7 +16,7 @@ override_dh_auto_clean:
override_dh_auto_configure:
lrelease */*/*.ts */*.ts
# convert to dynamic linking
- find . -name '*.pro' -a -not -path './.pc/*' -exec sed -i.orig -e 's/staticlib/dll/g' -e 's/lib\([A-Za-z]*\)\.a/lib\1.so/' {} \;
+ #find . -name '*.pro' -a -not -path './.pc/*' -exec sed -i.orig -e 's/staticlib/dll/g' -e 's/lib\([A-Za-z]*\)\.a/lib\1.so/' {} \;
dh_auto_configure
override_dh_auto_install:
@@ -21,7 +24,7 @@ override_dh_auto_install:
mkdir -p debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)
mv lib/lib*.so* debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)
dh_auto_install
- find . -name '*.pro' -a -not -path './.pc/*' -exec test -e {}.orig \; -a -exec mv -f {}.orig {} \;
+ #find . -name '*.pro' -a -not -path './.pc/*' -exec test -e {}.orig \; -a -exec mv -f {}.orig {} \;
get-orig-source:
@d=$$(readlink -e $(MAKEFILE_LIST)); \
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/collab-maint/openrpt.git
More information about the pkg-xtuple-maintainers
mailing list