Package: qpxtool
Version: 0.6.1-3.1~local0
Severity: normal
Tags: patch
When trying to build a local package with the patch from #463886 applied (which
works for me too btw), I had two problems.
First, qmake is called, which is an alternative and points to qmake-qt4
on my system. It seems that qmake-qt3 should be called explicitely here.
Second, 03-0.6.1.1.dpatch changes qpxtool-gui/Makefile.qmake. Since the build
system recreates that file with qmake afterwards, the patch may not unapply
cleanly (and did not in my case).
The included patch fixes those two issues.
Cheers.
diff -u qpxtool-0.6.1/debian/patches/01-qtdir.dpatch
qpxtool-0.6.1/debian/patches/01-qtdir.dpatch
--- qpxtool-0.6.1/debian/patches/01-qtdir.dpatch
+++ qpxtool-0.6.1/debian/patches/01-qtdir.dpatch
@@ -13,11 +13,11 @@
Makefile.qmake: qproject
- $(QTDIR)/bin/qmake -o Makefile.qmake
-+ qmake -o Makefile.qmake
++ qmake-qt3 -o Makefile.qmake
qproject:
- $(QTDIR)/bin/qmake -project -o qpxtool.pro \
-+ qmake -project -o qpxtool.pro \
++ qmake-qt3 -project -o qpxtool.pro \
CONFIG+="thread" \
INCLUDEPATH+="../lib/include" \
LIBS+="-lqpxtransport -lqpxplextor -lqpxpioneer -lqpxscan" \
diff -u qpxtool-0.6.1/debian/patches/03-0.6.1.1.dpatch
qpxtool-0.6.1/debian/patches/03-0.6.1.1.dpatch
--- qpxtool-0.6.1/debian/patches/03-0.6.1.1.dpatch
+++ qpxtool-0.6.1/debian/patches/03-0.6.1.1.dpatch
@@ -195,17 +195,6 @@
# if defined(SG_FLAG_UNUSED_LUN_INHIBIT)
# define SG_FLAG_LUN_INHIBIT SG_FLAG_UNUSED_LUN_INHIBIT
diff -Naur qpxtool-0.6.1.orig/qpxtool-gui/Makefile.qmake
qpxtool-0.6.1/qpxtool-gui/Makefile.qmake
---- qpxtool-0.6.1.orig/qpxtool-gui/Makefile.qmake 2007-12-27
13:28:53.000000000 +0000
-+++ qpxtool-0.6.1/qpxtool-gui/Makefile.qmake 2007-12-27 13:35:03.000000000
+0000
-@@ -16,7 +16,7 @@
- CXXFLAGS = -pipe -Wall -W -O2 -D_REENTRANT -DQT_NO_DEBUG -DQT_THREAD_SUPPORT
-DQT_SHARED -DQT_TABLET_SUPPORT
- LEXFLAGS =
- YACCFLAGS= -d
--INCPATH = -I/usr/share/qt3/mkspecs/default -I. -I../lib/include -I.
-Iinclude -I/usr/include/qt3
-+INCPATH = -I/usr/share/qt3/mkspecs/default -I. -I../lib/include -I.
-Iinclude -Iui -I/usr/include/qt3
- LINK = g++
- LFLAGS =
- LIBS = $(SUBLIBS) -L../lib/lib -L/usr/share/qt3/lib -L/usr/X11R6/lib
-lqpxtransport -lqpxplextor -lqpxpioneer -lqpxscan -lqt-mt -lXext -lX11 -lm
-lpthread
diff -Naur qpxtool-0.6.1.orig/qpxtool-gui/QPxTool.cpp
qpxtool-0.6.1/qpxtool-gui/QPxTool.cpp
--- qpxtool-0.6.1.orig/qpxtool-gui/QPxTool.cpp 2007-08-19 14:04:14.000000000
+0000
+++ qpxtool-0.6.1/qpxtool-gui/QPxTool.cpp 2007-12-27 13:33:32.000000000
+0000
