Francois Andriot
12 years ago
parent
7336aed1c1
commit
23921d42c6
@ -0,0 +1,46 @@
|
||||
commit 6e5a3b666215cef086b9116b834475227dbf9343
|
||||
Author: Timothy Pearson <kb9vqf@pearsoncomputing.net>
|
||||
Date: 1327529588 -0600
|
||||
|
||||
Fix linear alphabet string errors
|
||||
|
||||
diff --git a/amarok/src/sqlite/sqlite3.c b/amarok/src/sqlite/sqlite3.c
|
||||
index 1d55403..2b1d3e0 100644
|
||||
--- a/amarok/src/sqlite/sqlite3.c
|
||||
+++ b/amarok/src/sqlite/sqlite3.c
|
||||
@@ -11964,7 +11964,7 @@ int os2OpenDirectory(
|
||||
SQLITE_PRIVATE int sqlite3Os2TempFileName( char *zBuf ){
|
||||
static const unsigned char zChars[] =
|
||||
"abcdefghijklmnopqrstuvwxyz"
|
||||
- "ABCDEFGHIJKLMNOPTQRSTUVWXYZ"
|
||||
+ "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
|
||||
"0123456789";
|
||||
int i, j;
|
||||
PSZ zTempPath = 0;
|
||||
@@ -13914,7 +13914,7 @@ SQLITE_PRIVATE int sqlite3UnixTempFileName(char *zBuf){
|
||||
};
|
||||
static const unsigned char zChars[] =
|
||||
"abcdefghijklmnopqrstuvwxyz"
|
||||
- "ABCDEFGHIJKLMNOPTQRSTUVWXYZ"
|
||||
+ "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
|
||||
"0123456789";
|
||||
int i, j;
|
||||
struct stat buf;
|
||||
@@ -17014,7 +17014,7 @@ static int winOpenDirectory(
|
||||
SQLITE_PRIVATE int sqlite3WinTempFileName(char *zBuf){
|
||||
static char zChars[] =
|
||||
"abcdefghijklmnopqrstuvwxyz"
|
||||
- "ABCDEFGHIJKLMNOPTQRSTUVWXYZ"
|
||||
+ "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
|
||||
"0123456789";
|
||||
int i, j;
|
||||
char zTempPath[SQLITE_TEMPNAME_SIZE];
|
||||
@@ -48880,7 +48880,7 @@ static void loadExt(sqlite3_context *context, int argc, sqlite3_value **argv){
|
||||
static void randStr(sqlite3_context *context, int argc, sqlite3_value **argv){
|
||||
static const unsigned char zSrc[] =
|
||||
"abcdefghijklmnopqrstuvwxyz"
|
||||
- "ABCDEFGHIJKLMNOPTQRSTUVWXYZ"
|
||||
+ "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
|
||||
"0123456789"
|
||||
".-!,:*^+=_|?/<> ";
|
||||
int iMin, iMax, n, r, i;
|
||||
@ -0,0 +1,13 @@
|
||||
--- filelight/Makefile.am.ORI 2012-08-04 10:34:47.712896146 +0200
|
||||
+++ filelight/Makefile.am 2012-08-04 10:34:52.911800735 +0200
|
||||
@@ -1,4 +1,4 @@
|
||||
-SUBDIRS = src misc doc po
|
||||
+SUBDIRS = src misc doc
|
||||
|
||||
messages: rc.cpp
|
||||
$(EXTRACTRC) `find . -name "*.rc" -o -name "*.ui"` >> rc.cpp
|
||||
--- filelight/doc/Makefile.am.ORI 2012-08-04 10:36:33.894947477 +0200
|
||||
+++ filelight/doc/Makefile.am 2012-08-04 10:36:38.509862783 +0200
|
||||
@@ -1 +1 @@
|
||||
-SUBDIRS = $(AUTODIRS)
|
||||
+SUBDIRS = filelight
|
||||
@ -0,0 +1,17 @@
|
||||
--- fusion-icon/Makefile.ori 2012-08-04 11:13:26.208733002 +0200
|
||||
+++ fusion-icon/Makefile 2012-08-04 11:16:13.354858961 +0200
|
||||
@@ -1,12 +1,13 @@
|
||||
PREFIX = '/usr'
|
||||
DESTDIR = '/'
|
||||
+PYTHON_SITELIB = '/usr/lib/python2.7/site-packages'
|
||||
#interfaces = 'gtk qt4'
|
||||
|
||||
all:
|
||||
@python setup.py build
|
||||
|
||||
install:
|
||||
- @python setup.py install --prefix=${PREFIX} --root=${DESTDIR}
|
||||
+ @python setup.py install --prefix=${PREFIX} --root=${DESTDIR} --install-lib=${PYTHON_SITELIB}
|
||||
|
||||
uninstall:
|
||||
@python setup.py uninstall
|
||||
@ -0,0 +1,27 @@
|
||||
commit 59c7639f5e9f3ef40b06cb0e011216cc748e3f85
|
||||
Author: Timothy Pearson <kb9vqf@pearsoncomputing.net>
|
||||
Date: 1337933593 -0500
|
||||
|
||||
Define QT_CLEAN_NAMESPACE during libmng checks
|
||||
|
||||
diff --git a/configure.in.in b/configure.in.in
|
||||
index f5e959c..1cdda0b 100644
|
||||
--- a/configure.in.in
|
||||
+++ b/configure.in.in
|
||||
@@ -98,6 +98,8 @@ AC_SUBST(GV_ASM_DEFS)
|
||||
# libmng check (for gvmngformattype.*)
|
||||
#
|
||||
LIBMNG=
|
||||
+CXXFLAGS_SAVE="$CXXFLAGS"
|
||||
+CXXFLAGS="$CXXFLAGS -DQT_CLEAN_NAMESPACE"
|
||||
KDE_CHECK_HEADER(libmng.h,
|
||||
[
|
||||
KDE_CHECK_LIB(mng, mng_initialize,
|
||||
@@ -106,6 +108,7 @@ KDE_CHECK_HEADER(libmng.h,
|
||||
LIBMNG="-lmng $LIBZ -lm"
|
||||
], [], $LIBZ -lm)
|
||||
])
|
||||
+CXXFLAGS="$CXXFLAGS_SAVE"
|
||||
AC_SUBST(LIBMNG)
|
||||
if test -z "$LIBMNG"; then
|
||||
AC_WARN([Can't find libmng.h, Gwenview won't be compiled with MNG support])
|
||||
@ -0,0 +1,11 @@
|
||||
--- gwenview/src/gvcore/Makefile.am.ORI 2012-08-04 12:50:37.306573906 +0200
|
||||
+++ gwenview/src/gvcore/Makefile.am 2012-08-04 12:50:46.112710411 +0200
|
||||
@@ -6,7 +6,7 @@
|
||||
|
||||
libgwenviewcore_la_LIBADD = \
|
||||
$(LIB_KFILE) $(LIB_KDEUI) $(LIB_KDECORE) $(LIB_KDEPRINT) $(LIB_QT) \
|
||||
- $(LIBJPEG) $(LIBPNG) $(LIBMNG) $(GV_LIB_XCURSOR) $(LIB_EXIV2)\
|
||||
+ $(LIBJPEG) $(LIBPNG) $(LIBMNG) $(GV_LIB_XCURSOR) $(LIB_EXIV2) $(LIB_KPARTS) -lkdefx \
|
||||
-lkmediaplayer ../imageutils/libgvimageutils.la \
|
||||
../tsthread/libtsthread.la
|
||||
|
||||
@ -0,0 +1,22 @@
|
||||
--- k3b/applications/k3b/libk3bdevice/configure.in.in.ORI 2012-08-04 14:47:03.081813892 +0200
|
||||
+++ k3b/applications/k3b/libk3bdevice/configure.in.in 2012-08-04 14:47:25.421612485 +0200
|
||||
@@ -165,7 +165,7 @@
|
||||
dbusqt_lib=NOTFOUND
|
||||
dbusqt=NOTFOUND
|
||||
|
||||
- search_incs="$kde_includes /usr/include /usr/include/dbus-1.0 /usr/local/include /usr/local/include/dbus-1.0"
|
||||
+ search_incs="$kde_includes /usr/include /usr/include/dbus-1.0 /usr/local/include /usr/local/include/dbus-1.0 /opt/trinity/include/dbus-1.0"
|
||||
AC_FIND_FILE(dbus/connection.h, $search_incs, dbusqt_incdir)
|
||||
|
||||
if test -r $dbusqt_incdir/dbus/connection.h ; then
|
||||
--- k3b/libk3bdevice/configure.in.in.ORI 2012-08-04 14:57:19.624255359 +0200
|
||||
+++ k3b/libk3bdevice/configure.in.in 2012-08-04 14:57:33.719128285 +0200
|
||||
@@ -165,7 +165,7 @@
|
||||
dbusqt_lib=NOTFOUND
|
||||
dbusqt=NOTFOUND
|
||||
|
||||
- search_incs="$kde_includes /usr/include /usr/include/dbus-1.0 /usr/local/include /usr/local/include/dbus-1.0"
|
||||
+ search_incs="$kde_includes /usr/include /usr/include/dbus-1.0 /usr/local/include /usr/local/include/dbus-1.0 /opt/trinity/include/dbus-1.0"
|
||||
AC_FIND_FILE(dbus/connection.h, $search_incs, dbusqt_incdir)
|
||||
|
||||
if test -r $dbusqt_incdir/dbus/connection.h ; then
|
||||
@ -0,0 +1,131 @@
|
||||
--- k3b/libk3bdevice/Makefile.am.ORI 2012-08-04 14:09:53.794930123 +0200
|
||||
+++ k3b/libk3bdevice/Makefile.am 2012-08-04 14:10:08.246593402 +0200
|
||||
@@ -6,7 +6,7 @@
|
||||
|
||||
lib_LTLIBRARIES = libk3bdevice.la
|
||||
|
||||
-libk3bdevice_la_LIBADD = $(LIB_KIO) $(RESMGR_LIB) $(CAM_LIB) $(HAL_DBUS_LIBS)
|
||||
+libk3bdevice_la_LIBADD = $(LIB_KIO) $(RESMGR_LIB) $(CAM_LIB) $(HAL_DBUS_LIBS) $(LIB_QT) $(LIB_KDECORE)
|
||||
|
||||
# lib version 5 for K3b 1.0
|
||||
libk3bdevice_la_LDFLAGS = $(all_libraries) -version-info 5:0:0 -no-undefined
|
||||
--- k3b/libk3b/Makefile.am.ORI 2012-08-04 14:13:26.067400663 +0200
|
||||
+++ k3b/libk3b/Makefile.am 2012-08-04 14:13:34.150243648 +0200
|
||||
@@ -16,7 +16,7 @@
|
||||
plugin/libk3bplugin.la \
|
||||
tools/libk3btools.la \
|
||||
jobs/libjobs.la \
|
||||
- $(VIDEODVDLIB) \
|
||||
+ $(VIDEODVDLIB) $(LIB_KDEUI) $(LIB_QT) $(LIB_KDECORE) $(LIBDL) -lkdefx -lDCOP \
|
||||
../libk3bdevice/libk3bdevice.la
|
||||
|
||||
libk3b_la_LDFLAGS = $(all_libraries) -version-info 3:0:0 -no-undefined
|
||||
--- k3b/plugins/decoder/wave/Makefile.am.ORI 2012-08-04 15:26:55.434435396 -0400
|
||||
+++ k3b/plugins/decoder/wave/Makefile.am 2012-08-04 15:27:06.802685139 -0400
|
||||
@@ -4,7 +4,7 @@
|
||||
|
||||
libk3bwavedecoder_la_SOURCES = k3bwavedecoder.cpp
|
||||
|
||||
-libk3bwavedecoder_la_LIBADD = $(LIB_KDECORE) ../../../libk3b/libk3b.la
|
||||
+libk3bwavedecoder_la_LIBADD = $(LIB_KDECORE) $(LIB_QT) ../../../libk3b/libk3b.la ../../../libk3bdevice/libk3bdevice.la
|
||||
libk3bwavedecoder_la_LDFLAGS = -avoid-version -module -no-undefined $(all_libraries)
|
||||
|
||||
pluginsdir = $(kde_datadir)/k3b/plugins
|
||||
--- k3b/plugins/decoder/ogg/Makefile.am.ORI 2012-08-04 15:33:41.805310213 -0400
|
||||
+++ k3b/plugins/decoder/ogg/Makefile.am 2012-08-04 15:34:09.767685132 -0400
|
||||
@@ -5,6 +5,6 @@
|
||||
libk3boggvorbisdecoder_la_SOURCES = k3boggvorbisdecoder.cpp
|
||||
|
||||
-libk3boggvorbisdecoder_la_LIBADD = ../../../libk3b/libk3b.la -logg -lvorbis -lvorbisfile
|
||||
+libk3boggvorbisdecoder_la_LIBADD = ../../../libk3b/libk3b.la ../../../libk3b/plugin/libk3bplugin.la ../../../libk3bdevice/libk3bdevice.la -logg -lvorbis -lvorbisfile $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KIO)
|
||||
libk3boggvorbisdecoder_la_LDFLAGS = -avoid-version -module -no-undefined $(all_libraries)
|
||||
|
||||
pluginsdir = $(kde_datadir)/k3b/plugins
|
||||
--- k3b/plugins/decoder/flac/Makefile.am.ORI 2012-08-04 15:39:28.418435409 -0400
|
||||
+++ k3b/plugins/decoder/flac/Makefile.am 2012-08-04 15:39:41.490685093 -0400
|
||||
@@ -4,7 +4,7 @@
|
||||
|
||||
libk3bflacdecoder_la_SOURCES = k3bflacdecoder.cpp
|
||||
|
||||
-libk3bflacdecoder_la_LIBADD = ../../../libk3b/libk3b.la $(LIB_KDEUI) -lFLAC++ -lFLAC $(taglib_libs)
|
||||
+libk3bflacdecoder_la_LIBADD = ../../../libk3b/libk3b.la ../../../libk3bdevice/libk3bdevice.la $(LIB_KDEUI) $(LIB_KDECORE) $(LIB_QT) -lFLAC++ -lFLAC $(taglib_libs)
|
||||
libk3bflacdecoder_la_LDFLAGS = -avoid-version -module -no-undefined $(all_libraries)
|
||||
|
||||
pluginsdir = $(kde_datadir)/k3b/plugins
|
||||
--- k3b/plugins/decoder/libsndfile/Makefile.am.ORI 2012-08-04 15:43:24.035435310 -0400
|
||||
+++ k3b/plugins/decoder/libsndfile/Makefile.am 2012-08-04 15:43:33.579684947 -0400
|
||||
@@ -4,7 +4,7 @@
|
||||
|
||||
libk3blibsndfiledecoder_la_SOURCES = k3blibsndfiledecoder.cpp
|
||||
|
||||
-libk3blibsndfiledecoder_la_LIBADD = ../../../libk3b/libk3b.la $(LIB_KDEUI) -lsndfile
|
||||
+libk3blibsndfiledecoder_la_LIBADD = ../../../libk3b/libk3b.la ../../../libk3bdevice/libk3bdevice.la ../../../libk3b/plugin/libk3bplugin.la $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KIO) -lsndfile
|
||||
libk3blibsndfiledecoder_la_LDFLAGS = -avoid-version -module -no-undefined $(all_libraries)
|
||||
|
||||
pluginsdir = $(kde_datadir)/k3b/plugins
|
||||
--- k3b/plugins/decoder/musepack/Makefile.am.ORI 2012-08-04 15:46:29.503435327 -0400
|
||||
+++ k3b/plugins/decoder/musepack/Makefile.am 2012-08-04 15:46:37.662685065 -0400
|
||||
@@ -7,7 +7,7 @@
|
||||
|
||||
libk3bmpcdecoder_la_SOURCES = k3bmpcdecoder.cpp k3bmpcwrapper.cpp
|
||||
|
||||
-libk3bmpcdecoder_la_LIBADD = ../../../libk3b/libk3b.la $(MPC_LIBS)
|
||||
+libk3bmpcdecoder_la_LIBADD = ../../../libk3b/libk3b.la ../../../libk3bdevice/libk3bdevice.la ../../../libk3b/plugin/libk3bplugin.la $(MPC_LIBS) $(LIB_QT) $(LIB_KDECORE) $(LIB_KIO) $(LIB_KDEUI)
|
||||
libk3bmpcdecoder_la_LDFLAGS = -avoid-version -module -no-undefined $(all_libraries)
|
||||
|
||||
pluginsdir = $(kde_datadir)/k3b/plugins
|
||||
--- k3b/plugins/encoder/sox/Makefile.am.ORI 2012-08-04 15:48:44.045310191 -0400
|
||||
+++ k3b/plugins/encoder/sox/Makefile.am 2012-08-04 15:48:53.509685113 -0400
|
||||
@@ -4,7 +4,7 @@
|
||||
|
||||
libk3bsoxencoder_la_SOURCES = base_k3bsoxencoderconfigwidget.ui k3bsoxencoder.cpp
|
||||
|
||||
-libk3bsoxencoder_la_LIBADD = ../../../libk3b/libk3b.la $(LIB_KDECORE)
|
||||
+libk3bsoxencoder_la_LIBADD = ../../../libk3b/libk3b.la ../../../libk3bdevice/libk3bdevice.la $(LIB_KDECORE) $(LIB_QT)
|
||||
libk3bsoxencoder_la_LDFLAGS = -avoid-version -module -no-undefined $(all_libraries)
|
||||
|
||||
pluginsdir = $(kde_datadir)/k3b/plugins
|
||||
--- k3b/plugins/encoder/external/Makefile.am.ORI 2012-08-04 15:51:06.900310165 -0400
|
||||
+++ k3b/plugins/encoder/external/Makefile.am 2012-08-04 15:51:16.084435154 -0400
|
||||
@@ -6,7 +6,7 @@
|
||||
base_k3bexternalencodereditwidget.ui k3bexternalencoder.cpp \
|
||||
k3bexternalencoderconfigwidget.cpp k3bexternalencodercommand.cpp
|
||||
|
||||
-libk3bexternalencoder_la_LIBADD = ../../../libk3b/libk3b.la $(LIB_KDECORE)
|
||||
+libk3bexternalencoder_la_LIBADD = ../../../libk3b/libk3b.la ../../../libk3bdevice/libk3bdevice.la $(LIB_KDECORE) $(LIB_QT) $(LIB_KDEUI)
|
||||
libk3bexternalencoder_la_LDFLAGS = -avoid-version -module -no-undefined $(all_libraries)
|
||||
|
||||
pluginsdir = $(kde_datadir)/k3b/plugins
|
||||
--- k3b/plugins/encoder/ogg/Makefile.am.ORI 2012-08-04 15:53:42.509310180 -0400
|
||||
+++ k3b/plugins/encoder/ogg/Makefile.am 2012-08-04 15:53:52.493684861 -0400
|
||||
@@ -4,7 +4,7 @@
|
||||
|
||||
libk3boggvorbisencoder_la_SOURCES = base_k3boggvorbisencodersettingswidget.ui k3boggvorbisencoder.cpp
|
||||
|
||||
-libk3boggvorbisencoder_la_LIBADD = ../../../libk3b/libk3b.la $(LIB_KDECORE) -logg -lvorbis -lvorbisenc
|
||||
+libk3boggvorbisencoder_la_LIBADD = ../../../libk3b/libk3b.la $(LIB_KDECORE) -logg -lvorbis -lvorbisenc $(LIB_QT) $(LIB_KDEUI)
|
||||
libk3boggvorbisencoder_la_LDFLAGS = -avoid-version -module -no-undefined $(all_libraries)
|
||||
|
||||
pluginsdir = $(kde_datadir)/k3b/plugins
|
||||
--- k3b/plugins/audiooutput/arts/Makefile.am.ORI 2012-08-04 15:56:16.309435344 -0400
|
||||
+++ k3b/plugins/audiooutput/arts/Makefile.am 2012-08-04 15:56:26.541685090 -0400
|
||||
@@ -4,7 +4,7 @@
|
||||
|
||||
libk3bartsoutputplugin_la_SOURCES = k3bartsoutputplugin.cpp
|
||||
|
||||
-libk3bartsoutputplugin_la_LIBADD = ../../../libk3b/libk3b.la -lartsc
|
||||
+libk3bartsoutputplugin_la_LIBADD = ../../../libk3b/libk3b.la -lartsc $(LIB_KDECORE) $(LIB_QT)
|
||||
libk3bartsoutputplugin_la_LDFLAGS = -avoid-version -module -no-undefined $(all_libraries)
|
||||
|
||||
pluginsdir = $(kde_datadir)/k3b/plugins
|
||||
--- k3b/plugins/audiooutput/alsa/Makefile.am.ORI 2012-08-04 15:58:27.539435332 -0400
|
||||
+++ k3b/plugins/audiooutput/alsa/Makefile.am 2012-08-04 15:58:42.595685074 -0400
|
||||
@@ -5,7 +5,7 @@
|
||||
libk3balsaoutputplugin_la_SOURCES = k3balsaoutputplugin.cpp
|
||||
|
||||
libk3balsaoutputplugin_la_CFLAGS = $(ALSA_CFLAGS)
|
||||
-libk3balsaoutputplugin_la_LIBADD = ../../../libk3b/libk3b.la $(ALSA_LIBS)
|
||||
+libk3balsaoutputplugin_la_LIBADD = ../../../libk3b/libk3b.la $(ALSA_LIBS) $(LIB_KDECORE) $(LIB_QT) $(LIB_KDEUI)
|
||||
libk3balsaoutputplugin_la_LDFLAGS = -avoid-version -module -no-undefined $(all_libraries)
|
||||
|
||||
pluginsdir = $(kde_datadir)/k3b/plugins
|
||||
@ -0,0 +1,19 @@
|
||||
commit b3bb8a8f4438bdab23809387e9f6b85a5b5914f3
|
||||
Author: Timothy Pearson <kb9vqf@pearsoncomputing.net>
|
||||
Date: 1336103211 -0500
|
||||
|
||||
Fix another string format error
|
||||
|
||||
diff --git a/libk9copy/k9saveimage.cpp b/libk9copy/k9saveimage.cpp
|
||||
index edc4162..23613d8 100644
|
||||
--- a/libk9copy/k9saveimage.cpp
|
||||
+++ b/libk9copy/k9saveimage.cpp
|
||||
@@ -76,7 +76,7 @@ void k9SaveImage::run() {
|
||||
TQString sFileName=m_tempFile->name();
|
||||
m_image.save(sFileName,"PNG");
|
||||
sFileName="\rINFOIMAGE:"+sFileName;
|
||||
- fprintf(stderr,sFileName.utf8());
|
||||
+ fprintf(stderr,"%s",sFileName.utf8());
|
||||
|
||||
m_mutex.unlock();
|
||||
}
|
||||
@ -0,0 +1,53 @@
|
||||
commit 3bfc84b0fc3558c377e2f5a99548a6903a9ee7c3
|
||||
Author: Timothy Pearson <kb9vqf@pearsoncomputing.net>
|
||||
Date: 1336066302 -0500
|
||||
|
||||
Fix 'format not a string literal' error
|
||||
Clean up warning
|
||||
|
||||
diff --git a/libk9copy/k9burndvd.cpp b/libk9copy/k9burndvd.cpp
|
||||
index e6f6675..9f95352 100644
|
||||
--- a/libk9copy/k9burndvd.cpp
|
||||
+++ b/libk9copy/k9burndvd.cpp
|
||||
@@ -112,7 +112,7 @@ void k9BurnDVD::mkisoSizeStdout(KProcess *proc, char *buffer, int buflen) {
|
||||
;
|
||||
}
|
||||
|
||||
-const TQString &k9BurnDVD::getImageSize() {
|
||||
+const TQString k9BurnDVD::getImageSize() {
|
||||
TQString c;
|
||||
c="mkisofs";
|
||||
proc2=new k9Process;
|
||||
@@ -215,8 +215,8 @@ void k9BurnDVD::burnWithGenisoimage() {
|
||||
if ( KMessageBox::warningContinueCancel ( 0,i18n("Insert a recordable DVD"), i18n("DVD burning"))!=KMessageBox::Continue)
|
||||
cancelled=true;
|
||||
}
|
||||
- qDebug(proc->debug());
|
||||
- }
|
||||
+ qDebug("%s", proc->debug());
|
||||
+ }
|
||||
|
||||
|
||||
if (!cancelled) {
|
||||
@@ -239,7 +239,7 @@ void k9BurnDVD::burnWithGenisoimage() {
|
||||
}
|
||||
}
|
||||
}
|
||||
- }
|
||||
+ }
|
||||
}
|
||||
}
|
||||
|
||||
diff --git a/libk9copy/k9burndvd.h b/libk9copy/k9burndvd.h
|
||||
index fc2edce..94e1e71 100644
|
||||
--- a/libk9copy/k9burndvd.h
|
||||
+++ b/libk9copy/k9burndvd.h
|
||||
@@ -71,7 +71,7 @@ private:
|
||||
void getWodimCmd(k9Process *proc);
|
||||
|
||||
void burnWithK3b();
|
||||
- const TQString &getImageSize();
|
||||
+ const TQString getImageSize();
|
||||
TQString imageSize;
|
||||
TQString m_speed;
|
||||
private slots: // Private slots
|
||||
@ -0,0 +1,23 @@
|
||||
commit d9ed8b3291e596eafed777956a062dc8816d0d3c
|
||||
Author: Timothy Pearson <kb9vqf@pearsoncomputing.net>
|
||||
Date: 1336083386 -0500
|
||||
|
||||
Fix 'format not a string literal' error
|
||||
|
||||
diff --git a/libk9copy/k9cellcopylist.cpp b/libk9copy/k9cellcopylist.cpp
|
||||
index be4e406..31e85a3 100644
|
||||
--- a/libk9copy/k9cellcopylist.cpp
|
||||
+++ b/libk9copy/k9cellcopylist.cpp
|
||||
@@ -294,10 +294,10 @@ double k9CellCopyList::getMinFactor(bool _withMenus) {
|
||||
double totalSize=gettotalSize()+menuSize - (fforced) -m_inbytes;
|
||||
totalSize/=2.50;
|
||||
|
||||
-qDebug(TQString("totalSize(%1)=gettotalSize()(%2)+menuSize(%3) -(fforced(%4))-m_inbytes(%6)").tqarg(totalSize).tqarg(gettotalSize()).tqarg(menuSize).tqarg(fforced).tqarg(m_frcinbytes).tqarg(m_inbytes));
|
||||
+ qDebug("%s", (TQString("totalSize(%1)=gettotalSize()(%2)+menuSize(%3) -(fforced(%4))-m_inbytes(%6)").tqarg(totalSize).tqarg(gettotalSize()).tqarg(menuSize).tqarg(fforced).tqarg(m_frcinbytes).tqarg(m_inbytes)).ascii());
|
||||
|
||||
double minFactor=(fforced-m_frcinbytes) /(MaxSize- (totalSize +m_outbytes) - m_frcoutbytes) ;
|
||||
- qDebug(TQString("minfactor(%1)=(fforced(%2) -m_frinbytes(%3))/(MacSize(%4)-totalSize(%5)-m_outbytes(%6) - m_frcoutbytes(%7))").tqarg(minFactor).tqarg(fforced).tqarg(m_frcinbytes).tqarg(MaxSize).tqarg(totalSize).tqarg(m_outbytes).tqarg(m_frcoutbytes));
|
||||
+ qDebug("%s", (TQString("minfactor(%1)=(fforced(%2) -m_frinbytes(%3))/(MacSize(%4)-totalSize(%5)-m_outbytes(%6) - m_frcoutbytes(%7))").tqarg(minFactor).tqarg(fforced).tqarg(m_frcinbytes).tqarg(MaxSize).tqarg(totalSize).tqarg(m_outbytes).tqarg(m_frcoutbytes)).ascii());
|
||||
|
||||
if (minFactor<1)
|
||||
minFactor=1;
|
||||
@ -0,0 +1,28 @@
|
||||
commit a016df82c8970a2aaccbf3b061e102af3a3f04ab
|
||||
Author: Timothy Pearson <kb9vqf@pearsoncomputing.net>
|
||||
Date: 1336190259 -0500
|
||||
|
||||
Fix format string error
|
||||
|
||||
diff --git a/k9vamps/k9vamps.cpp b/k9vamps/k9vamps.cpp
|
||||
index d7bd43d..ebf4164 100755
|
||||
--- a/k9vamps/k9vamps.cpp
|
||||
+++ b/k9vamps/k9vamps.cpp
|
||||
@@ -399,7 +399,7 @@ int k9vamps::check_video_packet (uchar *ptr) {
|
||||
pad_packet_start_code |= (uint32_t) (ptr [3]);
|
||||
|
||||
if (pad_packet_start_code != 0x000001be)
|
||||
- qDebug (TQString("Bad padding packet start code at %1: %2").tqarg(rtell (ptr + vid_packet_length)).tqarg(pad_packet_start_code));
|
||||
+ qDebug ("%s", (TQString("Bad padding packet start code at %1: %2").tqarg(rtell (ptr + vid_packet_length)).tqarg(pad_packet_start_code)).ascii());
|
||||
else {
|
||||
pad_packet_length = ptr [4] << 8;
|
||||
pad_packet_length |= ptr [5];
|
||||
@@ -409,7 +409,7 @@ int k9vamps::check_video_packet (uchar *ptr) {
|
||||
|
||||
// length of video packet plus padding packet must always match sector size
|
||||
if (14 + vid_packet_length + pad_packet_length != SECT_SIZE)
|
||||
- qDebug (TQString("Bad video packet length at %1: %2").tqarg(rtell (ptr)).tqarg(vid_packet_length));
|
||||
+ qDebug ("%s", (TQString("Bad video packet length at %1: %2").tqarg(rtell (ptr)).tqarg(vid_packet_length)).ascii());
|
||||
|
||||
return rc;
|
||||
}
|
||||
@ -0,0 +1,19 @@
|
||||
commit 62acebb74cc50671eebf21a314912b12b082be1d
|
||||
Author: Timothy Pearson <kb9vqf@pearsoncomputing.net>
|
||||
Date: 1336073612 -0500
|
||||
|
||||
Fix FTBFS
|
||||
|
||||
diff --git a/libk9copy/k9burndvd.cpp b/libk9copy/k9burndvd.cpp
|
||||
index 9f95352..3860b79 100644
|
||||
--- a/libk9copy/k9burndvd.cpp
|
||||
+++ b/libk9copy/k9burndvd.cpp
|
||||
@@ -215,7 +215,7 @@ void k9BurnDVD::burnWithGenisoimage() {
|
||||
if ( KMessageBox::warningContinueCancel ( 0,i18n("Insert a recordable DVD"), i18n("DVD burning"))!=KMessageBox::Continue)
|
||||
cancelled=true;
|
||||
}
|
||||
- qDebug("%s", proc->debug());
|
||||
+ qDebug("%s", proc->debug().ascii());
|
||||
}
|
||||
|
||||
|
||||
@ -0,0 +1,19 @@
|
||||
commit ca864edeed0fe99b91c63616d4ec6d31ecdee217
|
||||
Author: Timothy Pearson <kb9vqf@pearsoncomputing.net>
|
||||
Date: 1336121912 -0500
|
||||
|
||||
Fix FTBFS
|
||||
|
||||
diff --git a/libk9copy/k9saveimage.cpp b/libk9copy/k9saveimage.cpp
|
||||
index 23613d8..758f8de 100644
|
||||
--- a/libk9copy/k9saveimage.cpp
|
||||
+++ b/libk9copy/k9saveimage.cpp
|
||||
@@ -76,7 +76,7 @@ void k9SaveImage::run() {
|
||||
TQString sFileName=m_tempFile->name();
|
||||
m_image.save(sFileName,"PNG");
|
||||
sFileName="\rINFOIMAGE:"+sFileName;
|
||||
- fprintf(stderr,"%s",sFileName.utf8());
|
||||
+ fprintf(stderr,"%s",sFileName.data());
|
||||
|
||||
m_mutex.unlock();
|
||||
}
|
||||
@ -0,0 +1,150 @@
|
||||
commit a8e98ad9ce209af0aba35ce26ec9200761b397df
|
||||
Author: Timothy Pearson <kb9vqf@pearsoncomputing.net>
|
||||
Date: 1336091322 -0500
|
||||
|
||||
Fix remaining string format errors
|
||||
|
||||
diff --git a/k9author/k9menu.cpp b/k9author/k9menu.cpp
|
||||
index 29f2b02..ea9c622 100644
|
||||
--- a/k9author/k9menu.cpp
|
||||
+++ b/k9author/k9menu.cpp
|
||||
@@ -143,7 +143,7 @@ void k9Menu::convertJpegToMpeg(const TQString &_imageJpg,const TQString &_imageM
|
||||
if (!process->normalExit()) {
|
||||
qDebug("error converting jpeg to mpeg");
|
||||
}
|
||||
- qDebug(process->debug().latin1());
|
||||
+ qDebug("%s", process->debug().latin1());
|
||||
}
|
||||
|
||||
void k9Menu::createAudio(const TQString & _audioFile) {
|
||||
diff --git a/k9author/k9newdvd.cpp b/k9author/k9newdvd.cpp
|
||||
index a2c02e7..454099e 100644
|
||||
--- a/k9author/k9newdvd.cpp
|
||||
+++ b/k9author/k9newdvd.cpp
|
||||
@@ -257,7 +257,7 @@ void k9NewDVD::createMencoderCmd(TQString &_cmd,TQString &_chapters, k9AviFile *
|
||||
*process << "-mpegopts" << "format=dvd" << "-vf" << "scale="+scale+",harddup" << "-srate" << "48000" << "-af" << "lavcresample=48000";
|
||||
*process << "-lavcopts" << TQString("vcodec=mpeg2video:vrc_buf_size=1835:vrc_maxrate=9800:vbitrate=%1:keyint=15:acodec=%3:abitrate=%2:aspect=16/9").tqarg(m_videoBitrate).tqarg(m_config->getPrefAudioBitrate()).tqarg(m_config->getPrefAudioFormat().lower());
|
||||
*process << "-ofps" << fps << "-o" << fileName << "-ss" << t1 << "-endpos" << t2 << _aviFile->getFileName();
|
||||
- qDebug(process->debug());
|
||||
+ qDebug("%s", process->debug().ascii());
|
||||
/*
|
||||
if (!m_progress->execute()) {
|
||||
m_cancel=true;
|
||||
diff --git a/k9devices/k9halconnection.cpp b/k9devices/k9halconnection.cpp
|
||||
index 76c6882..e55c0b3 100644
|
||||
--- a/k9devices/k9halconnection.cpp
|
||||
+++ b/k9devices/k9halconnection.cpp
|
||||
@@ -41,7 +41,7 @@ k9HalConnection::k9HalConnection(TQObject *parent, const char *name)
|
||||
dbus_error_init( &error );
|
||||
m_dbusConnect = dbus_bus_get( DBUS_BUS_SYSTEM, &error );
|
||||
if( dbus_error_is_set(&error) ) {
|
||||
- qDebug(TQString("Error connecting to DBUS : %1").tqarg(error.message));
|
||||
+ qDebug("%s", (TQString("Error connecting to DBUS : %1").tqarg(error.message)).ascii());
|
||||
return;
|
||||
}
|
||||
|
||||
diff --git a/k9devices/k9haldevice.cpp b/k9devices/k9haldevice.cpp
|
||||
index 9ddff76..0129efe 100644
|
||||
--- a/k9devices/k9haldevice.cpp
|
||||
+++ b/k9devices/k9haldevice.cpp
|
||||
@@ -95,7 +95,7 @@ void k9HalDevice::getDriveProperties() {
|
||||
m_canReadDvd=(caps & LIBHAL_DRIVE_CDROM_CAPS_DVDROM)==LIBHAL_DRIVE_CDROM_CAPS_DVDROM;
|
||||
m_canBurnDvd=(caps & LIBHAL_DRIVE_CDROM_CAPS_DVDR)==LIBHAL_DRIVE_CDROM_CAPS_DVDR;
|
||||
m_model=TQString(libhal_drive_get_model(drive));
|
||||
- // qDebug(TQString("canReadDvd:%1 canBurnDvd:%2 model:%3").tqarg(m_canReadDvd).tqarg(m_canBurnDvd).tqarg(m_model));
|
||||
+ // qDebug("%s", (TQString("canReadDvd:%1 canBurnDvd:%2 model:%3").tqarg(m_canReadDvd).tqarg(m_canBurnDvd).tqarg(m_model)).ascii());
|
||||
|
||||
|
||||
libhal_drive_free(drive);
|
||||
diff --git a/k9vamps/k9vamps.cpp b/k9vamps/k9vamps.cpp
|
||||
index f910979..d7bd43d 100755
|
||||
--- a/k9vamps/k9vamps.cpp
|
||||
+++ b/k9vamps/k9vamps.cpp
|
||||
@@ -368,7 +368,7 @@ int k9vamps::check_video_packet (uchar *ptr) {
|
||||
|
||||
if (ptr [7]) {
|
||||
if ((ptr [7] & 0xc0) != 0xc0)
|
||||
- qDebug (TQString("First video packet in sequence starting at %1 misses PTS or DTS, flags=%2").tqarg(rtell (ptr)).tqarg(ptr [7]));
|
||||
+ qDebug ("%s", (TQString("First video packet in sequence starting at %1 misses PTS or DTS, flags=%2").tqarg(rtell (ptr)).tqarg(ptr [7])).ascii());
|
||||
else {
|
||||
sequence_header_code = (uint32_t) (ptr [6 + 3 + ptr [8] + 0]) << 24;
|
||||
sequence_header_code |= (uint32_t) (ptr [6 + 3 + ptr [8] + 1]) << 16;
|
||||
diff --git a/libk9copy/k9cellcopylist.cpp b/libk9copy/k9cellcopylist.cpp
|
||||
index 31e85a3..fe880ac 100644
|
||||
--- a/libk9copy/k9cellcopylist.cpp
|
||||
+++ b/libk9copy/k9cellcopylist.cpp
|
||||
@@ -298,7 +298,7 @@ double k9CellCopyList::getMinFactor(bool _withMenus) {
|
||||
|
||||
double minFactor=(fforced-m_frcinbytes) /(MaxSize- (totalSize +m_outbytes) - m_frcoutbytes) ;
|
||||
qDebug("%s", (TQString("minfactor(%1)=(fforced(%2) -m_frinbytes(%3))/(MacSize(%4)-totalSize(%5)-m_outbytes(%6) - m_frcoutbytes(%7))").tqarg(minFactor).tqarg(fforced).tqarg(m_frcinbytes).tqarg(MaxSize).tqarg(totalSize).tqarg(m_outbytes).tqarg(m_frcoutbytes)).ascii());
|
||||
-
|
||||
+
|
||||
if (minFactor<1)
|
||||
minFactor=1;
|
||||
return minFactor;
|
||||
@@ -347,7 +347,7 @@ double k9CellCopyList::getfactor(bool _withMenus,bool _streams) {
|
||||
|
||||
if (dvdSize2 <0) {
|
||||
factor=2.5;
|
||||
- //qDebug(TQString("dvdSize (%1)- _outbytes(%2) - fforcedsh(%3)=%4").tqarg(dvdSize).tqarg(m_outbytes).tqarg(fforcedsh).tqarg(dvdSize2));
|
||||
+ //qDebug("%s", (TQString("dvdSize (%1)- _outbytes(%2) - fforcedsh(%3)=%4").tqarg(dvdSize).tqarg(m_outbytes).tqarg(fforcedsh).tqarg(dvdSize2).ascii()));
|
||||
}
|
||||
else {
|
||||
factor=(totalSize +menuSize - fforced -m_inbytes)/ dvdSize2 ;
|
||||
@@ -361,7 +361,7 @@ double k9CellCopyList::getfactor(bool _withMenus,bool _streams) {
|
||||
uint64_t i=m_inbytes;
|
||||
//if (o==0)
|
||||
// o=1;
|
||||
- //qDebug(TQString("factor : %1 realise : %2").tqarg(factor).tqarg((double)i/(double)o));
|
||||
+ //qDebug("%s", (TQString("factor : %1 realise : %2").tqarg(factor).tqarg((double)i/(double)o).ascii()));
|
||||
|
||||
if (factor<=1)
|
||||
factor=1;
|
||||
diff --git a/libk9copy/k9dvdauthor.cpp b/libk9copy/k9dvdauthor.cpp
|
||||
index 3676109..256cf53 100755
|
||||
--- a/libk9copy/k9dvdauthor.cpp
|
||||
+++ b/libk9copy/k9dvdauthor.cpp
|
||||
@@ -505,7 +505,7 @@ void k9DVDAuthor::DVDAuthorStderr(KProcess *proc, char *buffer, int buflen ) {
|
||||
// m_copied+=totalBytes - m_lastPos;
|
||||
m_copied=totalBytes;
|
||||
m_lastPos=totalBytes;
|
||||
- //qDebug(TQString("copied : %1 totalSize : %2").tqarg(m_copied).tqarg(m_totalSize*512));
|
||||
+ //qDebug("%s", (TQString("copied : %1 totalSize : %2").tqarg(m_copied).tqarg(m_totalSize*512).ascii());
|
||||
m_percent=(float)m_copied / (float)(m_totalSize/DVD_VIDEO_LB_LEN );
|
||||
|
||||
|
||||
@@ -526,7 +526,7 @@ void k9DVDAuthor::DVDAuthorStderr(KProcess *proc, char *buffer, int buflen ) {
|
||||
}
|
||||
/* else {
|
||||
if (!m_stderr.startsWith("libdvdread") && m_stderr.startsWith("libdvdnav"))
|
||||
- qDebug(m_stderr);
|
||||
+ qDebug("%s", m_stderr.ascii());
|
||||
}
|
||||
*/
|
||||
int end;
|
||||
diff --git a/libk9copy/k9ifo2.cpp b/libk9copy/k9ifo2.cpp
|
||||
index 57643c4..8c73213 100644
|
||||
--- a/libk9copy/k9ifo2.cpp
|
||||
+++ b/libk9copy/k9ifo2.cpp
|
||||
@@ -870,7 +870,7 @@ void k9Ifo2::checkBuffer(TQString lib,uchar* _buffer) {
|
||||
if (memcmp(bufCopy,_buffer,bufCopySize)!=0) {
|
||||
TQString c;
|
||||
c="Buffer de sortie altéré: " +lib;
|
||||
- qDebug(c.latin1());
|
||||
+ qDebug("%s", c.latin1());
|
||||
}
|
||||
}
|
||||
|
||||
diff --git a/libk9copy/k9mp4enc.cpp b/libk9copy/k9mp4enc.cpp
|
||||
index e29f206..0f4aaca 100644
|
||||
--- a/libk9copy/k9mp4enc.cpp
|
||||
+++ b/libk9copy/k9mp4enc.cpp
|
||||
@@ -392,7 +392,7 @@ void k9MP4Enc::execute ( k9DVDTitle *_title )
|
||||
TQCString str=* ( m_process->args().at ( i ) );
|
||||
s +=TQString ( str ) +" ";
|
||||
}
|
||||
- qDebug ( s );
|
||||
+ qDebug ( "%s", s.ascii() );
|
||||
time->start();
|
||||
m_timer3.start();
|
||||
connect ( m_process, TQT_SIGNAL ( receivedStdout ( KProcess *, char *, int ) ),this, TQT_SLOT ( getStdout ( KProcess *, char *, int ) ) );
|
||||
@ -1,12 +0,0 @@
|
||||
diff -Nuar k9copy.ORI/src/Makefile.am k9copy.P/src/Makefile.am
|
||||
--- k9copy.ORI/src/Makefile.am 2011-11-21 00:08:57.943296860 +0100
|
||||
+++ k9copy.P/src/Makefile.am 2011-11-21 00:18:50.559281008 +0100
|
||||
@@ -30,7 +30,7 @@
|
||||
kconfigdlg.cpp kviewmpeg2.cpp kviewmpeg2.h langselectw.ui main.cpp mencoderCmdGen.ui \
|
||||
playbackoptionsw.ui prefAuthor.ui prefDVD.ui prefMPEG4.ui prefMencoder.ui prefpreview.ui \
|
||||
titlefactor.ui viewmpeg2.ui
|
||||
-k9copy_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor $(LIB_KPARTS)
|
||||
+k9copy_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor $(LIB_KPARTS) $(LIBDL)
|
||||
k9copy_LDADD = $(top_builddir)/k9Mplayer/libk9mplayer.la \
|
||||
$(top_builddir)/k9author/libk9author.la $(top_builddir)/k9decmpeg/libk9decmpeg.la \
|
||||
$(top_builddir)/k9devices/libk9devices.la $(top_builddir)/k9vamps/libk9vamps.la \
|
||||
@ -0,0 +1,11 @@
|
||||
--- k9copy/src/Makefile.am.ldflags 2011-10-15 01:43:52.000000000 +0200
|
||||
+++ k9copy/src/Makefile.am 2012-08-04 17:40:13.574823034 +0200
|
||||
@@ -35,7 +35,7 @@
|
||||
$(top_builddir)/k9author/libk9author.la $(top_builddir)/k9decmpeg/libk9decmpeg.la \
|
||||
$(top_builddir)/k9devices/libk9devices.la $(top_builddir)/k9vamps/libk9vamps.la \
|
||||
$(top_builddir)/libdvdnav/libk9dvdnav.la $(top_builddir)/libk9copy/libk9copy.la \
|
||||
- $(top_builddir)/dvdread/libdvdread.la $(LIB_KDEUI) -lkmdi
|
||||
+ $(top_builddir)/dvdread/libdvdread.la $(LIB_KDEUI) -lkmdi $(LIBDL)
|
||||
|
||||
# this is where the desktop file will go
|
||||
shelldesktopdir = $(kde_appsdir)/Utilities
|
||||
@ -0,0 +1,27 @@
|
||||
commit 14ba7d8af6ef7248dcd3eb85ae977950d1758600
|
||||
Author: Timothy Pearson <kb9vqf@pearsoncomputing.net>
|
||||
Date: 1336066403 -0500
|
||||
|
||||
Fix 'format not a string literal' error
|
||||
|
||||
diff --git a/kbarcode/csvimportdlg.cpp b/kbarcode/csvimportdlg.cpp
|
||||
index 26e59da..6b07a7b 100644
|
||||
--- a/kbarcode/csvimportdlg.cpp
|
||||
+++ b/kbarcode/csvimportdlg.cpp
|
||||
@@ -334,7 +334,6 @@ void CSVImportDlg::accept()
|
||||
TQValueList<int> headers;
|
||||
TQStringList list;
|
||||
TQString name = getDatabaseName();
|
||||
- int i = 0;
|
||||
|
||||
TQString q = "INSERT INTO " + name + " (";
|
||||
for( int c = 0; c < table->horizontalHeader()->count(); c++ ) {
|
||||
@@ -375,7 +374,7 @@ void CSVImportDlg::accept()
|
||||
|
||||
TQSqlQuery query;
|
||||
if( !query.exec( line ) )
|
||||
- qDebug( i18n("Could not import the following line:") + line );
|
||||
+ qDebug( "%s", i18n("Could not import the following line:") + line );
|
||||
//KMessageBox::error( this, i18n("Could not import the following line:") + line );
|
||||
}
|
||||
|
||||
@ -0,0 +1,19 @@
|
||||
commit 62777d2782c7fa738eb047eff175785fc2cd24ff
|
||||
Author: Timothy Pearson <kb9vqf@pearsoncomputing.net>
|
||||
Date: 1336091409 -0500
|
||||
|
||||
Fix FTBFS
|
||||
|
||||
diff --git a/kbarcode/csvimportdlg.cpp b/kbarcode/csvimportdlg.cpp
|
||||
index 6b07a7b..b5c6efa 100644
|
||||
--- a/kbarcode/csvimportdlg.cpp
|
||||
+++ b/kbarcode/csvimportdlg.cpp
|
||||
@@ -374,7 +374,7 @@ void CSVImportDlg::accept()
|
||||
|
||||
TQSqlQuery query;
|
||||
if( !query.exec( line ) )
|
||||
- qDebug( "%s", i18n("Could not import the following line:") + line );
|
||||
+ qDebug( "%s", (i18n("Could not import the following line:") + line).ascii() );
|
||||
//KMessageBox::error( this, i18n("Could not import the following line:") + line );
|
||||
}
|
||||
|
||||
@ -0,0 +1,32 @@
|
||||
commit b8dc3f5795c618c3617302973fff7d7bbf0ead2d
|
||||
Author: Timothy Pearson <kb9vqf@pearsoncomputing.net>
|
||||
Date: 1336099921 -0500
|
||||
|
||||
Fix remaining string format errors
|
||||
|
||||
diff --git a/kbarcode/pixmapbarcode.cpp b/kbarcode/pixmapbarcode.cpp
|
||||
index 02cb19b..4768b3e 100644
|
||||
--- a/kbarcode/pixmapbarcode.cpp
|
||||
+++ b/kbarcode/pixmapbarcode.cpp
|
||||
@@ -178,7 +178,7 @@ bool PixmapBarcode::createPixmap( TQPixmap* target, int resx, int resy )
|
||||
cmd += input->name();
|
||||
cmd += " -sNOPAUSE -q - -c showpage quit";
|
||||
|
||||
- qDebug("cmd: " + cmd );
|
||||
+ qDebug("cmd: %s", cmd.ascii() );
|
||||
gs_pipe = popen( cmd.latin1(), "w" );
|
||||
if( !gs_pipe )
|
||||
{
|
||||
diff --git a/kbarcode/tbarcode2.cpp b/kbarcode/tbarcode2.cpp
|
||||
index 8490f7c..95cc64f 100644
|
||||
--- a/kbarcode/tbarcode2.cpp
|
||||
+++ b/kbarcode/tbarcode2.cpp
|
||||
@@ -122,7 +122,7 @@ bool TBarcode2::createPostscript( char** postscript, long* postscript_size )
|
||||
tbarcode->height(),
|
||||
tbarcode->checksum() );
|
||||
|
||||
- qDebug( "Cmd = " + cmd );
|
||||
+ qDebug( "Cmd = %s", cmd.ascii() );
|
||||
if( !readFromPipe( cmd.latin1(), postscript, postscript_size ) )
|
||||
return false;
|
||||
|
||||
@ -0,0 +1,8 @@
|
||||
--- kbfx/doc/CMakeLists.txt.ORI 2012-08-04 18:33:25.916251160 +0200
|
||||
+++ kbfx/doc/CMakeLists.txt 2012-08-04 18:33:49.658779402 +0200
|
||||
@@ -14,4 +14,4 @@
|
||||
)
|
||||
|
||||
INSTALL(FILES ${DOCFILES}
|
||||
- DESTINATION ${SHARE_INSTALL_PREFIX}/doc/kbfx)
|
||||
+ DESTINATION ${DOC_INSTALL_DIR}/kbfx)
|
||||
@ -0,0 +1,20 @@
|
||||
--- kbfx/plugins/applications/CMakeLists.txt.ORI 2012-08-04 18:24:43.221636976 +0200
|
||||
+++ kbfx/plugins/applications/CMakeLists.txt 2012-08-04 18:26:32.602463608 +0200
|
||||
@@ -21,6 +21,7 @@
|
||||
${KDE3_UI_LIBRARY}
|
||||
${KDE3_KHTML_LIBRARY}
|
||||
${M_LIBRARY}
|
||||
+ ${KDE3_DCOP_LIBRARY}
|
||||
)
|
||||
|
||||
KDE3_INSTALL_LIBTOOL_FILE(kbfxplasmadatastub ${LIB_INSTALL_DIR}/kbfx/plugins)
|
||||
--- kbfx/plugins/settings/CMakeLists.txt.ORI 2012-08-04 18:28:43.968853387 +0200
|
||||
+++ kbfx/plugins/settings/CMakeLists.txt 2012-08-04 18:29:10.408328041 +0200
|
||||
@@ -21,6 +21,7 @@
|
||||
${KDE3_UI_LIBRARY}
|
||||
${KDE3_KHTML_LIBRARY}
|
||||
${M_LIBRARY}
|
||||
+ ${KDE3_DCOP_LIBRARY}
|
||||
)
|
||||
|
||||
KDE3_INSTALL_LIBTOOL_FILE(kbfxplasmadatasettings ${LIB_INSTALL_DIR}/kbfx/plugins)
|
||||
Loading…
Reference in new issue