Go to:
Gentoo Home
Documentation
Forums
Lists
Bugs
Planet
Store
Wiki
Get Gentoo!
Gentoo's Bugzilla – Attachment 134129 Details for
Bug 196321
app-cdr/qpxtool-0.6.1 fails to build w/ linux-headers-2.6.23
Home
|
New
–
[Ex]
|
Browse
|
Search
|
Privacy Policy
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
fix qpxtool-0.6.1 & linux-headers-2.6.23
qpxtool-0.6.1-0.6.1.1.patch (text/plain), 12.99 KB, created by
Thomas Maguin
on 2007-10-22 19:16:18 UTC
(
hide
)
Description:
fix qpxtool-0.6.1 & linux-headers-2.6.23
Filename:
MIME Type:
Creator:
Thomas Maguin
Created:
2007-10-22 19:16:18 UTC
Size:
12.99 KB
patch
obsolete
>diff -Nru qpxtool-0.6.1/console/deadreader/deadreader.cpp qpxtool-0.6.1.1/console/deadreader/deadreader.cpp >--- qpxtool-0.6.1/console/deadreader/deadreader.cpp 2007-08-19 18:04:14.000000000 +0400 >+++ qpxtool-0.6.1.1/console/deadreader/deadreader.cpp 2007-10-22 22:50:00.000000000 +0400 >@@ -2,7 +2,7 @@ > * > * DeadDiscReader > * Copyright (C) 2006, Gennady "ShultZ" Kozlov <qpxtool@mail.ru> >- * it uses QPxTool SCSI transport lbrary >+ * it uses QPxTool SCSI transport library > * > */ > >diff -Nru qpxtool-0.6.1/console/pxcontrol/pxcontrol.cpp qpxtool-0.6.1.1/console/pxcontrol/pxcontrol.cpp >--- qpxtool-0.6.1/console/pxcontrol/pxcontrol.cpp 2007-08-19 18:04:14.000000000 +0400 >+++ qpxtool-0.6.1.1/console/pxcontrol/pxcontrol.cpp 2007-09-05 14:09:32.000000000 +0400 >@@ -554,17 +554,18 @@ > } > else if(!strcmp(argv[i],"--as-create")) { > flags |= FL_AS_CREATE; >+ ascre = 0; > if (argc>(i+1)) { > i++; >- if (!strcmp(argv[i],"q")) ascre = ASDB_CRE_QUICK; >- else if (!strcmp(argv[i],"f")) ascre = ASDB_CRE_FULL; >+ if (!strcmp(argv[i],"q")) ascre |= ASDB_CRE_QUICK; >+ else if (!strcmp(argv[i],"f")) ascre |= ASDB_CRE_FULL; > else > printf("invalid --as-create parameter 1: '%s'. Only 'q|f' are valid\n", argv[i]); > } > if (argc>(i+1)) { > i++; >- if (!strcmp(argv[i],"a")) ascre = ASDB_ADD; >- else if (!strcmp(argv[i],"r")) ascre = ASDB_REPLACE; >+ if (!strcmp(argv[i],"a")) ascre |= ASDB_ADD; >+ else if (!strcmp(argv[i],"r")) ascre |= ASDB_REPLACE; > else > printf("invalid --as-create parameter 2: '%s'. Only 'a|r' are valid\n", argv[i]); > } >diff -Nru qpxtool-0.6.1/console/pxcontrol/version.h qpxtool-0.6.1.1/console/pxcontrol/version.h >--- qpxtool-0.6.1/console/pxcontrol/version.h 2007-08-19 18:04:14.000000000 +0400 >+++ qpxtool-0.6.1.1/console/pxcontrol/version.h 2007-09-05 14:14:40.000000000 +0400 >@@ -9,4 +9,4 @@ > * See the file "COPYING" for the exact licensing terms. > */ > >-#define VERSION "1.1" >+#define VERSION "1.2" >diff -Nru qpxtool-0.6.1/lib/include/common_functions.h qpxtool-0.6.1.1/lib/include/common_functions.h >--- qpxtool-0.6.1/lib/include/common_functions.h 2007-08-19 18:04:14.000000000 +0400 >+++ qpxtool-0.6.1.1/lib/include/common_functions.h 2007-08-21 02:32:55.000000000 +0400 >@@ -1,6 +1,6 @@ > /* > * This file is part of the QPxTool project. >- * Copyright (C) 2005 Gennady "ShultZ" Kozlov <qpxtool@mail.ru> >+ * Copyright (C) 2005-2006 Gennady "ShultZ" Kozlov <qpxtool@mail.ru> > * > * This program is free software; you can redistribute it and/or modify > * it under the terms of the GNU General Public License as published by >diff -Nru qpxtool-0.6.1/lib/include/plextor_features.h qpxtool-0.6.1.1/lib/include/plextor_features.h >--- qpxtool-0.6.1/lib/include/plextor_features.h 2007-08-19 18:04:14.000000000 +0400 >+++ qpxtool-0.6.1.1/lib/include/plextor_features.h 2007-08-21 02:33:46.000000000 +0400 >@@ -1,6 +1,6 @@ > /* > * This file is part of the QPxTool project. >- * Copyright (C) 2005-2006 Gennady "ShultZ" Kozlov <qpxtool@mail.ru> >+ * Copyright (C) 2005-2007 Gennady "ShultZ" Kozlov <qpxtool@mail.ru> > * > * This program is free software; you can redistribute it and/or modify > * it under the terms of the GNU General Public License as published by >diff -Nru qpxtool-0.6.1/lib/include/qpx_mmc.h qpxtool-0.6.1.1/lib/include/qpx_mmc.h >--- qpxtool-0.6.1/lib/include/qpx_mmc.h 2007-08-19 18:04:14.000000000 +0400 >+++ qpxtool-0.6.1.1/lib/include/qpx_mmc.h 2007-08-21 02:33:05.000000000 +0400 >@@ -1,6 +1,6 @@ > /* > * This file is part of the QPxTool project. >- * Copyright (C) 2005-2006 Gennady "ShultZ" Kozlov <qpxtool@mail.ru> >+ * Copyright (C) 2005-2007 Gennady "ShultZ" Kozlov <qpxtool@mail.ru> > * > * This program is free software; you can redistribute it and/or modify > * it under the terms of the GNU General Public License as published by >diff -Nru qpxtool-0.6.1/lib/include/qpx_opcodes.h qpxtool-0.6.1.1/lib/include/qpx_opcodes.h >--- qpxtool-0.6.1/lib/include/qpx_opcodes.h 2007-08-19 18:04:14.000000000 +0400 >+++ qpxtool-0.6.1.1/lib/include/qpx_opcodes.h 2007-08-21 02:33:16.000000000 +0400 >@@ -1,6 +1,6 @@ > /* > * This file is part of the QPxTool project. >- * Copyright (C) 2005-2006 Gennady "ShultZ" Kozlov <qpxtool@mail.ru> >+ * Copyright (C) 2005-2007 Gennady "ShultZ" Kozlov <qpxtool@mail.ru> > * > * This program is free software; you can redistribute it and/or modify > * it under the terms of the GNU General Public License as published by >diff -Nru qpxtool-0.6.1/lib/qpxplextor/include/plextor_features.h qpxtool-0.6.1.1/lib/qpxplextor/include/plextor_features.h >--- qpxtool-0.6.1/lib/qpxplextor/include/plextor_features.h 2007-08-19 18:04:14.000000000 +0400 >+++ qpxtool-0.6.1.1/lib/qpxplextor/include/plextor_features.h 2007-08-21 02:33:46.000000000 +0400 >@@ -1,6 +1,6 @@ > /* > * This file is part of the QPxTool project. >- * Copyright (C) 2005-2006 Gennady "ShultZ" Kozlov <qpxtool@mail.ru> >+ * Copyright (C) 2005-2007 Gennady "ShultZ" Kozlov <qpxtool@mail.ru> > * > * This program is free software; you can redistribute it and/or modify > * it under the terms of the GNU General Public License as published by >diff -Nru qpxtool-0.6.1/lib/qpxplextor/plextor_features.cpp qpxtool-0.6.1.1/lib/qpxplextor/plextor_features.cpp >--- qpxtool-0.6.1/lib/qpxplextor/plextor_features.cpp 2007-08-19 18:04:14.000000000 +0400 >+++ qpxtool-0.6.1.1/lib/qpxplextor/plextor_features.cpp 2007-08-21 02:33:39.000000000 +0400 >@@ -1,6 +1,6 @@ > /* > * This file is part of the QPxTool project. >- * Copyright (C) 2005-2006 Gennady "ShultZ" Kozlov <qpxtool@mail.ru> >+ * Copyright (C) 2005-2007 Gennady "ShultZ" Kozlov <qpxtool@mail.ru> > * > * This program is free software; you can redistribute it and/or modify > * it under the terms of the GNU General Public License as published by >diff -Nru qpxtool-0.6.1/lib/qpxscan/plextor_qcheck.cpp qpxtool-0.6.1.1/lib/qpxscan/plextor_qcheck.cpp >--- qpxtool-0.6.1/lib/qpxscan/plextor_qcheck.cpp 2007-08-19 18:04:14.000000000 +0400 >+++ qpxtool-0.6.1.1/lib/qpxscan/plextor_qcheck.cpp 2007-09-20 15:04:35.000000000 +0400 >@@ -1,6 +1,6 @@ > /* > * This file is part of the QPxTool project. >- * Copyright (C) 2005-2006 Gennady "ShultZ" Kozlov <qpxtool@mail.ru> >+ * Copyright (C) 2005-2007 Gennady "ShultZ" Kozlov <qpxtool@mail.ru> > * > * > * Some Plextor commands got from PxScan and CDVDlib (C) Alexander Noe` >diff -Nru qpxtool-0.6.1/lib/qpxtransport/common_functions.cpp qpxtool-0.6.1.1/lib/qpxtransport/common_functions.cpp >--- qpxtool-0.6.1/lib/qpxtransport/common_functions.cpp 2007-08-19 18:04:14.000000000 +0400 >+++ qpxtool-0.6.1.1/lib/qpxtransport/common_functions.cpp 2007-08-21 02:32:45.000000000 +0400 >@@ -1,6 +1,6 @@ > /* > * This file is part of the QPxTool project. >- * Copyright (C) 2005 Gennady "ShultZ" Kozlov <qpxtool@mail.ru> >+ * Copyright (C) 2005-2006, Gennady "ShultZ" Kozlov <qpxtool@mail.ru> > * > * This program is free software; you can redistribute it and/or modify > * it under the terms of the GNU General Public License as published by >diff -Nru qpxtool-0.6.1/lib/qpxtransport/include/common_functions.h qpxtool-0.6.1.1/lib/qpxtransport/include/common_functions.h >--- qpxtool-0.6.1/lib/qpxtransport/include/common_functions.h 2007-08-19 18:04:14.000000000 +0400 >+++ qpxtool-0.6.1.1/lib/qpxtransport/include/common_functions.h 2007-08-21 02:32:55.000000000 +0400 >@@ -1,6 +1,6 @@ > /* > * This file is part of the QPxTool project. >- * Copyright (C) 2005 Gennady "ShultZ" Kozlov <qpxtool@mail.ru> >+ * Copyright (C) 2005-2006 Gennady "ShultZ" Kozlov <qpxtool@mail.ru> > * > * This program is free software; you can redistribute it and/or modify > * it under the terms of the GNU General Public License as published by >diff -Nru qpxtool-0.6.1/lib/qpxtransport/include/qpx_mmc.h qpxtool-0.6.1.1/lib/qpxtransport/include/qpx_mmc.h >--- qpxtool-0.6.1/lib/qpxtransport/include/qpx_mmc.h 2007-08-19 18:04:14.000000000 +0400 >+++ qpxtool-0.6.1.1/lib/qpxtransport/include/qpx_mmc.h 2007-08-21 02:33:05.000000000 +0400 >@@ -1,6 +1,6 @@ > /* > * This file is part of the QPxTool project. >- * Copyright (C) 2005-2006 Gennady "ShultZ" Kozlov <qpxtool@mail.ru> >+ * Copyright (C) 2005-2007 Gennady "ShultZ" Kozlov <qpxtool@mail.ru> > * > * This program is free software; you can redistribute it and/or modify > * it under the terms of the GNU General Public License as published by >diff -Nru qpxtool-0.6.1/lib/qpxtransport/include/qpx_opcodes.h qpxtool-0.6.1.1/lib/qpxtransport/include/qpx_opcodes.h >--- qpxtool-0.6.1/lib/qpxtransport/include/qpx_opcodes.h 2007-08-19 18:04:14.000000000 +0400 >+++ qpxtool-0.6.1.1/lib/qpxtransport/include/qpx_opcodes.h 2007-08-21 02:33:16.000000000 +0400 >@@ -1,6 +1,6 @@ > /* > * This file is part of the QPxTool project. >- * Copyright (C) 2005-2006 Gennady "ShultZ" Kozlov <qpxtool@mail.ru> >+ * Copyright (C) 2005-2007 Gennady "ShultZ" Kozlov <qpxtool@mail.ru> > * > * This program is free software; you can redistribute it and/or modify > * it under the terms of the GNU General Public License as published by >diff -Nru qpxtool-0.6.1/lib/qpxtransport/qpx_transport.cpp qpxtool-0.6.1.1/lib/qpxtransport/qpx_transport.cpp >--- qpxtool-0.6.1/lib/qpxtransport/qpx_transport.cpp 2007-08-19 18:04:14.000000000 +0400 >+++ qpxtool-0.6.1.1/lib/qpxtransport/qpx_transport.cpp 2007-10-22 22:55:36.000000000 +0400 >@@ -142,12 +142,17 @@ > > #if defined(__linux) > >+#if !defined(INT_MAX) >+#include <limits.h> >+#endif >+ > #include <sys/ioctl.h> > #include <linux/cdrom.h> > #include <mntent.h> > #include <sys/wait.h> > #include <sys/utsname.h> > #include <scsi/sg.h> >+ > #if !defined(SG_FLAG_LUN_INHIBIT) > # if defined(SG_FLAG_UNUSED_LUN_INHIBIT) > # define SG_FLAG_LUN_INHIBIT SG_FLAG_UNUSED_LUN_INHIBIT >diff -Nru qpxtool-0.6.1/qpxtool-gui/Makefile.qmake qpxtool-0.6.1.1/qpxtool-gui/Makefile.qmake >--- qpxtool-0.6.1/qpxtool-gui/Makefile.qmake 2007-08-19 18:04:14.000000000 +0400 >+++ qpxtool-0.6.1.1/qpxtool-gui/Makefile.qmake 2007-10-22 22:52:20.000000000 +0400 >@@ -1,6 +1,6 @@ > ############################################################################# > # Makefile for building: qpxtool >-# Generated by qmake (1.07a) (Qt 3.3.8) on: Sun Aug 19 18:04:15 2007 >+# Generated by qmake (1.07a) (Qt 3.3.8) on: Mon Oct 22 22:52:20 2007 > # Project: qpxtool.pro > # Template: app > # Command: $(QMAKE) -o Makefile.qmake qpxtool.pro >@@ -16,7 +16,7 @@ > CXXFLAGS = -pipe -Wall -W -O2 -D_REENTRANT -DQT_NO_DEBUG -DQT_THREAD_SUPPORT -DQT_SHARED > LEXFLAGS = > YACCFLAGS= -d >-INCPATH = -I/usr/lib/qt/mkspecs/default -I. -I../lib/include -I. -Iinclude -I$(QTDIR)/include >+INCPATH = -I/usr/lib/qt/mkspecs/default -I. -I../lib/include -I. -Iinclude -Iui -I$(QTDIR)/include > LINK = g++ > LFLAGS = -Wl,-rpath,../lib/lib -Wl,-rpath,$(QTDIR)/lib > LIBS = $(SUBLIBS) -L../lib/lib -L$(QTDIR)/lib -L/usr/X11R6/lib -lqpxtransport -lqpxplextor -lqpxpioneer -lqpxscan -lqt-mt -lXext -lX11 -lm -lpthread >diff -Nru qpxtool-0.6.1/qpxtool-gui/QPxTool.cpp qpxtool-0.6.1.1/qpxtool-gui/QPxTool.cpp >--- qpxtool-0.6.1/qpxtool-gui/QPxTool.cpp 2007-08-19 18:04:14.000000000 +0400 >+++ qpxtool-0.6.1.1/qpxtool-gui/QPxTool.cpp 2007-09-10 20:16:17.000000000 +0400 >@@ -1,6 +1,6 @@ > /* > * This file is part of the QPxTool project. >- * Copyright (C) 2005-2006 Gennady "ShultZ" Kozlov <qpxtool@mail.ru> >+ * Copyright (C) 2005-2007 Gennady "ShultZ" Kozlov <qpxtool@mail.ru> > * > * This program is free software; you can redistribute it and/or modify > * it under the terms of the GNU General Public License as published by >diff -Nru qpxtool-0.6.1/qpxtool-gui/main.cpp qpxtool-0.6.1.1/qpxtool-gui/main.cpp >--- qpxtool-0.6.1/qpxtool-gui/main.cpp 2007-08-19 18:04:14.000000000 +0400 >+++ qpxtool-0.6.1.1/qpxtool-gui/main.cpp 2007-08-19 18:46:36.000000000 +0400 >@@ -31,7 +31,7 @@ > { > // const char *program_name = argv[0]; > printf("\n________________________________________"); >- printf("\n QPxTool-%s\n (c) 2005-2006, Gennady \"ShultZ\" Kozlov",VERSION); >+ printf("\n QPxTool-%s\n (c) 2005-2007, Gennady \"ShultZ\" Kozlov",VERSION); > printf("\n________________________________________"); > printf("\ncurrent system:"); > uname(&sys); >diff -Nru qpxtool-0.6.1/qpxtool-gui/qcheck/test_threads.cpp qpxtool-0.6.1.1/qpxtool-gui/qcheck/test_threads.cpp >--- qpxtool-0.6.1/qpxtool-gui/qcheck/test_threads.cpp 2007-08-19 18:04:14.000000000 +0400 >+++ qpxtool-0.6.1.1/qpxtool-gui/qcheck/test_threads.cpp 2007-08-21 02:35:43.000000000 +0400 >@@ -1,6 +1,6 @@ > /* > * This file is part of the QPxTool project. >- * Copyright (C) 2005-2006 Gennady "ShultZ" Kozlov <qpxtool@mail.ru> >+ * Copyright (C) 2005-2007 Gennady "ShultZ" Kozlov <qpxtool@mail.ru> > * > * This program is free software; you can redistribute it and/or modify > * it under the terms of the GNU General Public License as published by >diff -Nru qpxtool-0.6.1/qpxtool-gui/version.h qpxtool-0.6.1.1/qpxtool-gui/version.h >--- qpxtool-0.6.1/qpxtool-gui/version.h 2007-08-19 18:04:14.000000000 +0400 >+++ qpxtool-0.6.1.1/qpxtool-gui/version.h 2007-08-21 02:35:24.000000000 +0400 >@@ -1,6 +1,6 @@ > /* > * This file is part of the QPxTool project. >- * Copyright (C) 2005-2006 Gennady "ShultZ" Kozlov <qpxtool@mail.ru> >+ * Copyright (C) 2005-2007 Gennady "ShultZ" Kozlov <qpxtool@mail.ru> > * > * This program is free software; you can redistribute it and/or modify > * it under the terms of the GNU General Public License as published by
<b>You cannot view the attachment while viewing its details because your browser does not support IFRAMEs. <a href="attachment.cgi?id=134129">View the attachment on a separate page</a>.</b>
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 196321
: 134129 |
134131
