| 1 |
carlo 10/01/25 20:08:34 |
| 2 |
|
| 3 |
Added: qpxtool-0.7.0-locale-install-race-patch |
| 4 |
qpxtool-0.7.0-ldlibs.patch |
| 5 |
Log: |
| 6 |
Fix a parallel build issue, bug #298662, a parallel install issue and build with --as-needed. |
| 7 |
(Portage version: 2.2_rc61/cvs/Linux i686) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 app-cdr/qpxtool/files/qpxtool-0.7.0-locale-install-race-patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-cdr/qpxtool/files/qpxtool-0.7.0-locale-install-race-patch?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-cdr/qpxtool/files/qpxtool-0.7.0-locale-install-race-patch?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: qpxtool-0.7.0-locale-install-race-patch |
| 16 |
=================================================================== |
| 17 |
--- qpxtool-0.7.0/gui/updateqm.pri.orig 2010-01-25 19:44:45.061640334 +0100 |
| 18 |
+++ qpxtool-0.7.0/gui/updateqm.pri 2010-01-25 19:40:03.711640850 +0100 |
| 19 |
@@ -0,0 +1,19 @@ |
| 20 |
+isEmpty(QMAKE_LRELEASE) { |
| 21 |
+ |
| 22 |
+ win32:QMAKE_LRELEASE = $$[QT_INSTALL_BINS]\lrelease.exe |
| 23 |
+ |
| 24 |
+ else:QMAKE_LRELEASE = $$[QT_INSTALL_BINS]/lrelease |
| 25 |
+ |
| 26 |
+} |
| 27 |
+ |
| 28 |
+updateqm.input = TRANSLATIONS |
| 29 |
+ |
| 30 |
+updateqm.output = ${QMAKE_FILE_PATH}/${QMAKE_FILE_BASE}.qm |
| 31 |
+ |
| 32 |
+updateqm.commands = $$QMAKE_LRELEASE ${QMAKE_FILE_IN} -qm ${QMAKE_FILE_PATH}/${QMAKE_FILE_BASE}.qm |
| 33 |
+ |
| 34 |
+updateqm.CONFIG += no_link |
| 35 |
+ |
| 36 |
+QMAKE_EXTRA_COMPILERS += updateqm |
| 37 |
+ |
| 38 |
+PRE_TARGETDEPS += compiler_updateqm_make_all |
| 39 |
--- qpxtool-0.7.0/gui/qpxtool.pro.orig 2010-01-25 19:46:45.011641756 +0100 |
| 40 |
+++ qpxtool-0.7.0/gui/qpxtool.pro 2010-01-25 19:47:08.397640627 +0100 |
| 41 |
@@ -2,6 +2,8 @@ |
| 42 |
# Automatically generated by qmake (2.01a) ?? ???. 24 12:26:02 2009 |
| 43 |
###################################################################### |
| 44 |
|
| 45 |
+include( updateqm.pri ) |
| 46 |
+ |
| 47 |
MOC_DIR=moc |
| 48 |
OBJECTS_DIR=obj |
| 49 |
QT+=network |
| 50 |
|
| 51 |
|
| 52 |
|
| 53 |
1.1 app-cdr/qpxtool/files/qpxtool-0.7.0-ldlibs.patch |
| 54 |
|
| 55 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-cdr/qpxtool/files/qpxtool-0.7.0-ldlibs.patch?rev=1.1&view=markup |
| 56 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-cdr/qpxtool/files/qpxtool-0.7.0-ldlibs.patch?rev=1.1&content-type=text/plain |
| 57 |
|
| 58 |
Index: qpxtool-0.7.0-ldlibs.patch |
| 59 |
=================================================================== |
| 60 |
--- qpxtool-0.7.0.old/console/f1tattoo/Makefile 2010-01-09 12:05:18.000000000 +0100 |
| 61 |
+++ qpxtool-0.7.0/console/f1tattoo/Makefile 2010-01-09 12:21:39.000000000 +0100 |
| 62 |
@@ -5,7 +5,7 @@ |
| 63 |
|
| 64 |
CXXFLAGS += -I. -I../../lib/include $(LPNG_INC) |
| 65 |
CFLAGS += -I. -I../../lib/include $(LPNG_INC) |
| 66 |
-LDLIBS += -lqpxtransport -lqpxyamaha $(LPNG_LIB) -L../../lib/lib |
| 67 |
+LDLIBS += -lqpxtransport -lqpxyamaha -L../../lib/lib $(LPNG_LIB) |
| 68 |
|
| 69 |
$(BIN): $(OBJS) |
| 70 |
$(CXX) $(CXXFLAGS) $(LDFLAGS) $^ -o $@ $(LDLIBS) |
| 71 |
--- qpxtool-0.7.0/console/qscan/Makefile.orig 2010-01-23 19:37:37.201487022 +0100 |
| 72 |
+++ qpxtool-0.7.0/console/qscan/Makefile 2010-01-23 19:44:07.915487435 +0100 |
| 73 |
@@ -5,7 +5,7 @@ |
| 74 |
|
| 75 |
CXXFLAGS += -I. -I../../lib/include |
| 76 |
CFLAGS += -I. -I../../lib/include |
| 77 |
-LDLIBS += -lqpxtransport -lqpxscan -lqpxplextor -L../../lib/lib $(LIBS_DL) |
| 78 |
+LDLIBS += -lqpxtransport -lqpxscan -lqpxplextor -L../../lib/lib |
| 79 |
|
| 80 |
$(BIN): $(OBJS) |
| 81 |
$(CXX) $(CXXFLAGS) $(LDFLAGS) $^ -o $@ $(LDLIBS) |
| 82 |
--- qpxtool-0.7.0/lib/qpxscan/Makefile.orig 2010-01-25 18:27:39.373641192 +0100 |
| 83 |
+++ qpxtool-0.7.0/lib/qpxscan/Makefile 2010-01-25 18:18:03.420641552 +0100 |
| 84 |
@@ -12,6 +12,6 @@ |
| 85 |
VER_MINOR = 7 |
| 86 |
VER_MICRO = 0 |
| 87 |
|
| 88 |
-LDLIBS += -lqpxtransport -lqpxplextor -L../lib $(LIBS_INET) |
| 89 |
+LDLIBS += $(LIBS_DL) -lqpxtransport -lqpxplextor -L../lib $(LIBS_INET) |
| 90 |
|
| 91 |
include ../Makefile.lib |
Archives