SOURCES: 0250-out_of_source_build.diff, 0255-qtreeview-selection-columns-hi...

arekm arekm at pld-linux.org
Sat Mar 7 11:44:12 CET 2009


Author: arekm                        Date: Sat Mar  7 10:44:12 2009 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- qt-copy patches

---- Files affected:
SOURCES:
   0250-out_of_source_build.diff (1.1 -> 1.2) , 0255-qtreeview-selection-columns-hidden.diff (1.1 -> 1.2) , 0268-fix-actions-in-submenus-remain-enabled-for-modal-dialogs-mac.diff (NONE -> 1.1)  (NEW), 0269-msvc-webkit-compile.diff (NONE -> 1.1)  (NEW), 0273-odbc-64bit-compile.diff (NONE -> 1.1)  (NEW), 0274-shm-native-image-fix.diff (NONE -> 1.1)  (NEW), 0275-qtconcurrent-threadcount.diff (NONE -> 1.1)  (NEW), 2.2.8-bacula-conf.patch (NONE -> 1.1)  (NEW), 2.2.8-jobmedia-fix.patch (NONE -> 1.1)  (NEW), 2.2.8-jobmedia.patch (NONE -> 1.1)  (NEW), 2.2.8-pool-source.patch (NONE -> 1.1)  (NEW), 2.2.8-strip-path.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: SOURCES/0250-out_of_source_build.diff
diff -u SOURCES/0250-out_of_source_build.diff:1.1 SOURCES/0250-out_of_source_build.diff:1.2
--- SOURCES/0250-out_of_source_build.diff:1.1	Sat Nov  8 22:23:57 2008
+++ SOURCES/0250-out_of_source_build.diff	Sat Mar  7 11:44:00 2009
@@ -20,27 +20,6 @@
          Environment::execute(args, env, QStringList());
      }
  }
-@@ -3185,10 +3209,19 @@
-                     QString dirPath = fixSeparators( it->directory + "/" );
-                     QString projectName = it->proFile;
-                     QString makefileName = buildPath + "/" + dirPath + it->target;
-+
-+                    if (sourcePath != buildPath)
-+                        QDir().mkpath(buildPath + "/" + dirPath);
-+
-                     QStringList args;
- 
-                     args << fixSeparators( buildPath + "/bin/qmake" );
--                    args << projectName;
-+
-+                    if (sourcePath != buildPath)
-+                        args << fixSeparators(sourcePath + "/" + dirPath + projectName);
-+                    else
-+                        args << projectName;
-+
-                     args << dictionary[ "QMAKE_ALL_ARGS" ];
- 
-                     cout << "For " << qPrintable(dirPath + projectName) << endl;
 Index: bin/syncqt
 ===================================================================
 --- bin/syncqt	(revision 863314)

================================================================
Index: SOURCES/0255-qtreeview-selection-columns-hidden.diff
diff -u SOURCES/0255-qtreeview-selection-columns-hidden.diff:1.1 SOURCES/0255-qtreeview-selection-columns-hidden.diff:1.2
--- SOURCES/0255-qtreeview-selection-columns-hidden.diff:1.1	Sat Nov  8 22:23:58 2008
+++ SOURCES/0255-qtreeview-selection-columns-hidden.diff	Sat Mar  7 11:44:01 2009
@@ -33,10 +33,10 @@
 index d5ca633..b7975be 100644
 --- src/gui/itemviews/qtreeview.cpp
 +++ src/gui/itemviews/qtreeview.cpp
-@@ -3494,7 +3494,7 @@ QList<QPair<int, int> > QTreeViewPrivate::columnRanges(const QModelIndex &topInd
+@@ -3494,7 +3494,7 @@
      current.first = -2; // -1 is not enough because -1+1 = 0
      current.second = -2;
-     foreach(int logicalColumn, logicalIndexes) {
+     foreach (int logicalColumn, logicalIndexes) {
 -        if (current.second + 1 != logicalColumn) {
 +        if (current.second + 1 != logicalColumn && !header->isSectionHidden(current.second + 1)) {
              if (current.first != -2) {

================================================================
Index: SOURCES/0268-fix-actions-in-submenus-remain-enabled-for-modal-dialogs-mac.diff
diff -u /dev/null SOURCES/0268-fix-actions-in-submenus-remain-enabled-for-modal-dialogs-mac.diff:1.1
--- /dev/null	Sat Mar  7 11:44:14 2009
+++ SOURCES/0268-fix-actions-in-submenus-remain-enabled-for-modal-dialogs-mac.diff	Sat Mar  7 11:44:01 2009
@@ -0,0 +1,58 @@
+Trolltech task ID : 239646
+KDE : 
+applied: no
+os: mac
+author: Till Adam <adam at kde.org>
+
+On OSX, the main menubar is global and needs to be disabled (and thus its
+actions) when a modal dialog is shown. Without this patch, that only
+happens for top level actions. Symptom is that non-top level keybaord
+shortcuts of actions get triggered by key evens on modal dialogs
+(such as the folder selector in KMail). Patch submitted to Trenton
+at NQS, and approved by him. Cocoa-enabled fix will be in 4.5.
+
+Included in 4.5
+
+Index: src/gui/widgets/qmenu_mac.cpp
+===================================================================
+--- src/gui/widgets/qmenu_mac.cpp	(revision 916654)
++++ src/gui/widgets/qmenu_mac.cpp	(working copy)
+@@ -229,16 +229,14 @@
+     }
+ }
+ 
+-//toggling of modal state
+-void qt_mac_set_modal_state(MenuRef menu, bool on)
++// helper that recurses into a menu structure and en/dis-ables them
++void qt_mac_set_modal_state_helper_recursive(MenuRef menu, MenuRef merge, bool on)
+ {
+-    MenuRef merge = 0;
+-    GetMenuItemProperty(menu, 0, kMenuCreatorQt, kMenuPropertyMergeMenu,
+-                        sizeof(merge), 0, &merge);
+-
+     for(int i = 0; i < CountMenuItems(menu); i++) {
+         MenuRef submenu;
+         GetMenuItemHierarchicalMenu(menu, i+1, &submenu);
++        // process sub menus recursively
++        qt_mac_set_modal_state_helper_recursive(submenu, merge, on);
+         if(submenu != merge) {
+             if (on)
+                 DisableMenuItem(submenu, 0);
+@@ -246,7 +244,17 @@
+                 EnableMenuItem(submenu, 0);
+         }
+     }
++}
+ 
++//toggling of modal state
++void qt_mac_set_modal_state(MenuRef menu, bool on)
++{
++    MenuRef merge = 0;
++    GetMenuItemProperty(menu, 0, kMenuCreatorQt, kMenuPropertyMergeMenu,
++                        sizeof(merge), 0, &merge);
++
++    qt_mac_set_modal_state_helper_recursive(menu, merge, on);
++
+     UInt32 commands[] = { kHICommandQuit, kHICommandPreferences, kHICommandAbout, kHICommandAboutQt, 0 };
+     for(int c = 0; commands[c]; c++) {
+         bool enabled = !on;

================================================================
Index: SOURCES/0269-msvc-webkit-compile.diff
diff -u /dev/null SOURCES/0269-msvc-webkit-compile.diff:1.1
--- /dev/null	Sat Mar  7 11:44:14 2009
+++ SOURCES/0269-msvc-webkit-compile.diff	Sat Mar  7 11:44:02 2009
@@ -0,0 +1,24 @@
+Trolltech task ID : N244010
+KDE :
+applied: no
+os: windows/msvc
+author: Christian Ehrlicher <ch.ehrlicher at gmx.de>
+
+Due to the implicit build rules created in 'batch mode' all source files
+inside a directory matching those rules are compiled. This means make also
+wants to compile pcre.c which isn't needed at all (and does not compile).
+--> Disabling batch mode for this directory to work around this bug.
+
+
+Index: src/3rdparty/webkit/JavaScriptCore/pcre/pcre.pri
+===================================================================
+--- src/3rdparty/webkit/JavaScriptCore/pcre/pcre.pri	(revision 922833)
++++ src/3rdparty/webkit/JavaScriptCore/pcre/pcre.pri	(working copy)
+@@ -2,6 +2,7 @@
+ VPATH += $$PWD
+ INCLUDEPATH += $$PWD $$OUTPUT_DIR/JavaScriptCore/tmp
+ DEPENDPATH += $$PWD
++win32-msvc*: CONFIG += no_batch
+ 
+ isEmpty(GENERATED_SOURCES_DIR):GENERATED_SOURCES_DIR = tmp
+ 

================================================================
Index: SOURCES/0273-odbc-64bit-compile.diff
diff -u /dev/null SOURCES/0273-odbc-64bit-compile.diff:1.1
--- /dev/null	Sat Mar  7 11:44:15 2009
+++ SOURCES/0273-odbc-64bit-compile.diff	Sat Mar  7 11:44:02 2009
@@ -0,0 +1,25 @@
+qt-bugs@ issue: N245521
+QtSw task ID:
+applied: no
+author: Alex Merry
+
+Index: src/sql/drivers/odbc/qsql_odbc.cpp
+===================================================================
+--- src/sql/drivers/odbc/qsql_odbc.cpp	(revision 928726)
++++ src/sql/drivers/odbc/qsql_odbc.cpp	(working copy)
+@@ -64,13 +64,13 @@ QT_BEGIN_NAMESPACE
+ #endif
+ 
+ // newer platform SDKs use SQLLEN instead of SQLINTEGER
+-#if defined(SQLLEN) || defined(Q_OS_WIN64)
++#if defined(SQLLEN) || defined(Q_OS_WIN64) || (defined(Q_OS_UNIX) && !defined(Q_OS_MAC))
+ # define QSQLLEN SQLLEN
+ #else
+ # define QSQLLEN SQLINTEGER
+ #endif
+ 
+-#if defined(SQLULEN) || defined(Q_OS_WIN64)
++#if defined(SQLULEN) || defined(Q_OS_WIN64) || (defined(Q_OS_UNIX) && !defined(Q_OS_MAC))
+ # define QSQLULEN SQLULEN
+ #else
+ # define QSQLULEN SQLUINTEGER

================================================================
Index: SOURCES/0274-shm-native-image-fix.diff
diff -u /dev/null SOURCES/0274-shm-native-image-fix.diff:1.1
--- /dev/null	Sat Mar  7 11:44:16 2009
+++ SOURCES/0274-shm-native-image-fix.diff	Sat Mar  7 11:44:03 2009
@@ -0,0 +1,97 @@
+qt-bugs@ issue : none
+Qt Software task ID : none
+bugs.kde.org number : none
+applied: no 
+author: Fredrik Höglund <fredrik at kde.org>
+
+This patch makes the raster graphics system use shared images instead
+of shared pixmaps.
+
+Shared memory pixmaps are deprecated since they are slower than shared
+images with modern graphics hardware. They are also not supported by EXA
+drivers and can be disabled in the latest version of the NVidia driver.
+
+Index: src/gui/kernel/qapplication_x11.cpp
+===================================================================
+--- src/gui/kernel/qapplication_x11.cpp (revision 934506)
++++ src/gui/kernel/qapplication_x11.cpp (working copy)
+@@ -1943,7 +1943,7 @@ void qt_init(QApplicationPrivate *priv,
+             // to determine whether the display is local or not (not 100 % accurate)
+             bool local = displayName.isEmpty() || displayName.lastIndexOf(QLatin1Char(':')) == 0;
+             if (local && (qgetenv("QT_X11_NO_MITSHM").toInt() == 0))
+-                X11->use_mitshm = mitshm_pixmaps;
++                X11->use_mitshm = true;
+         }
+ #endif // QT_NO_MITSHM
+ 
+Index: src/gui/image/qnativeimage_p.h
+===================================================================
+--- src/gui/image/qnativeimage_p.h	(revision 930645)
++++ src/gui/image/qnativeimage_p.h	(working copy)
+@@ -85,7 +85,6 @@
+ 
+ #elif defined(Q_WS_X11) && !defined(QT_NO_MITSHM)
+     XImage *xshmimg;
+-    Pixmap xshmpm;
+     XShmSegmentInfo xshminfo;
+ 
+ #elif defined(Q_WS_MAC)
+Index: src/gui/image/qnativeimage.cpp
+===================================================================
+--- src/gui/image/qnativeimage.cpp	(revision 930645)
++++ src/gui/image/qnativeimage.cpp	(working copy)
+@@ -140,7 +140,6 @@
+ {
+     if (!X11->use_mitshm) {
+         xshmimg = 0;
+-        xshmpm = 0;
+         image = QImage(width, height, format);
+         return;
+     }
+@@ -184,11 +183,6 @@
+             shmctl(xshminfo.shmid, IPC_RMID, 0);
+         return;
+     }
+-    xshmpm = XShmCreatePixmap(X11->display, DefaultRootWindow(X11->display), xshmimg->data,
+-                              &xshminfo, width, height, dd);
+-    if (!xshmpm) {
+-        qWarning() << "QNativeImage: Unable to create shared Pixmap.";
+-    }
+ }
+ 
+ 
+@@ -197,10 +191,6 @@
+     if (!xshmimg)
+         return;
+ 
+-    if (xshmpm) {
+-        XFreePixmap(X11->display, xshmpm);
+-        xshmpm = 0;
+-    }
+     XShmDetach(X11->display, &xshminfo);
+     xshmimg->data = 0;
+     XDestroyImage(xshmimg);
+Index: src/gui/painting/qwindowsurface_raster.cpp
+===================================================================
+--- src/gui/painting/qwindowsurface_raster.cpp	(revision 930645)
++++ src/gui/painting/qwindowsurface_raster.cpp	(working copy)
+@@ -228,9 +228,16 @@
+ 
+     QRect br = rgn.boundingRect().translated(offset);
+ #ifndef QT_NO_MITSHM
+-    if (d_ptr->image->xshmpm) {
+-        XCopyArea(X11->display, d_ptr->image->xshmpm, widget->handle(), d_ptr->gc,
+-                  br.x(), br.y(), br.width(), br.height(), wbr.x(), wbr.y());
++    if (d_ptr->image->xshmimg && (br.width() * br.height() > 65536)) {
++        const QImage &src = d->image->image;
++        br = br.intersected(src.rect());
++        // Hack to make sure we satisify the PutImage() constraints in the X server,
++        // since the doShmPutImage() route currently forces a migration to system ram.
++        wbr.setX(wbr.x() - br.x());
++        br.setX(0);
++        br.setWidth(src.width());
++        XShmPutImage(X11->display, widget->handle(), d_ptr->gc, d_ptr->image->xshmimg,
++                     br.x(), br.y(), wbr.x(), wbr.y(), br.width(), br.height(), False);
+         XSync(X11->display, False);
+     } else
+ #endif

================================================================
Index: SOURCES/0275-qtconcurrent-threadcount.diff
diff -u /dev/null SOURCES/0275-qtconcurrent-threadcount.diff:1.1
--- /dev/null	Sat Mar  7 11:44:17 2009
+++ SOURCES/0275-qtconcurrent-threadcount.diff	Sat Mar  7 11:44:04 2009
@@ -0,0 +1,33 @@
+qt-bugs@ issue : none
+Qt Software task ID : 244718
+bugs.kde.org number : none
+applied: no
+author: Scott Wheeler <wheeler at kde.org>
+
+Calling idealThreadCount() calls sysconfig in every run, as well as ignoring
+the configured number of threads for the main thread pool.  The syscall overhead
+means that QtConcurrent is basically rendered useless for relatively atomic tasks
+since the advantages of parallelization are far less than the overhead.  In my
+tests this patch procuced a 30-50x improvement in performance on Linux.
+
+Index: src/corelib/concurrent/qtconcurrentreducekernel.h
+===================================================================
+--- src/corelib/concurrent/qtconcurrentreducekernel.h	(revision 936031)
++++ src/corelib/concurrent/qtconcurrentreducekernel.h	(working copy)
+@@ -210,12 +210,14 @@
+ 
+     inline bool shouldThrottle()
+     {
+-        return (resultsMapSize > (ReduceQueueThrottleLimit * QThread::idealThreadCount()));
++        return (resultsMapSize > (ReduceQueueThrottleLimit *
++                                  QThreadPool::globalInstance()->maxThreadCount()));
+     }
+ 
+     inline bool shouldStartThread()
+     {
+-        return (resultsMapSize <= (ReduceQueueStartLimit * QThread::idealThreadCount()));
++        return (resultsMapSize <= (ReduceQueueStartLimit *
++                                   QThreadPool::globalInstance()->maxThreadCount()));
+     }
+ };
+ 

================================================================
Index: SOURCES/2.2.8-bacula-conf.patch
diff -u /dev/null SOURCES/2.2.8-bacula-conf.patch:1.1
--- /dev/null	Sat Mar  7 11:44:18 2009
+++ SOURCES/2.2.8-bacula-conf.patch	Sat Mar  7 11:44:04 2009
@@ -0,0 +1,32 @@
+
+ This patch automatically adds the Bacula database and user name to
+ the default make_catalog_backup Run script call line in the bacula-dir.conf
+ file.
+
+ Apply it to version 2.2.8 or earlier with:
+
+ cd <bacula-source>
+ patch -p0 <2.2.8-bacula-conf.patch
+ ./configure <your-options>
+ make
+ ...
+ make install
+
+
+Index: src/dird/bacula-dir.conf.in
+===================================================================
+--- src/dird/bacula-dir.conf.in	(revision 6327)
++++ src/dird/bacula-dir.conf.in	(working copy)
+@@ -61,7 +61,11 @@
+   FileSet="Catalog"
+   Schedule = "WeeklyCycleAfterBackup"
+   # This creates an ASCII copy of the catalog
+-  RunBeforeJob = "@scriptdir@/make_catalog_backup bacula bacula"
++  # WARNING!!! Passing the password via the command line is insecure.
++  # see comments in make_catalog_backup for details.
++  # Arguments to make_catalog_backup are:
++  #  make_catalog_backup <database-name> <user-name> <password> <host>
++  RunBeforeJob = "@scriptdir@/make_catalog_backup @db_name@ @db_user@"
+   # This deletes the copy of the catalog
+   RunAfterJob  = "@scriptdir@/delete_catalog_backup"
+   Write Bootstrap = "@working_dir@/BackupCatalog.bsr"

================================================================
Index: SOURCES/2.2.8-jobmedia-fix.patch
diff -u /dev/null SOURCES/2.2.8-jobmedia-fix.patch:1.1
--- /dev/null	Sat Mar  7 11:44:19 2009
+++ SOURCES/2.2.8-jobmedia-fix.patch	Sat Mar  7 11:44:05 2009
@@ -0,0 +1,40 @@
+
+ This patch fixes a bug that cause storage to create JOBMEDIA records 
+ for every block written to tape.
+
+ This Patch works with 2.2.8-jobmedia.patch
+
+ Apply this patch to Bacula 2.2.8 (and possibly any prior 2.2.x version) with:
+
+ cd <bacula-source>
+ patch -p0 <2.2.8-jobmedia-fix.patch
+ ./configure <your-options>
+ make
+ ...
+ make install
+
+
+Index: src/stored/block.c
+===================================================================
+--- src/stored/block.c  (revision 6531)
++++ src/stored/block.c  (working copy)
+@@ -374,7 +374,6 @@
+       if (dcr->NewVol) {
+          /* Note, setting a new volume also handles any pending new file */
+          set_new_volume_parameters(dcr);
+-         dcr->NewFile = false;        /* this handled for new file too */
+       } else {
+          set_new_file_parameters(dcr);
+       }
+Index: src/stored/device.c
+===================================================================
+--- src/stored/device.c (revision 6531)
++++ src/stored/device.c (working copy)
+@@ -226,6 +226,7 @@
+    }
+    set_new_file_parameters(dcr);
+    jcr->NumWriteVolumes++;
++   dcr->NewVol = false;
+ }
+
+ /*

================================================================
Index: SOURCES/2.2.8-jobmedia.patch
diff -u /dev/null SOURCES/2.2.8-jobmedia.patch:1.1
--- /dev/null	Sat Mar  7 11:44:19 2009
+++ SOURCES/2.2.8-jobmedia.patch	Sat Mar  7 11:44:05 2009
@@ -0,0 +1,152 @@
+
+ This patch fixes a migration bug that always has a zero index entry
+ (JobMedia record) as the first entry. This causes Bacula to search
+ for the first record during a restore rather than seek directly to
+ it.
+
+ You have to apply 2.2.8-jobmedia-fix.patch too.
+
+ Apply this patch to Bacula 2.2.8 (and possibly any prior 2.2.x version) with:
+
+ cd <bacula-source>
+ patch -p0 <2.2.8-jobmedia.patch
+ patch -p0 <2.2.8-jobmedia-fix.patch
+ ./configure <your-options>
+ make
+ ...
+ make install
+
+
+Index: src/stored/device.c
+===================================================================
+--- src/stored/device.c	(revision 6391)
++++ src/stored/device.c	(working copy)
+@@ -1,7 +1,7 @@
+ /*
+    Bacula® - The Network Backup Solution
+ 
+-   Copyright (C) 2000-2008 Free Software Foundation Europe e.V.
++   Copyright (C) 2000-2007 Free Software Foundation Europe e.V.
+ 
+    The main author of Bacula is Kern Sibbald, with contributions from
+    many others, a complete list can be found in the file AUTHORS.
+@@ -200,6 +200,19 @@
+    return ok;                               /* device locked */
+ }
+ 
++void set_start_vol_position(DCR *dcr)
++{
++   DEVICE *dev = dcr->dev;
++   /* Set new start position */
++   if (dev->is_tape()) {
++      dcr->StartBlock = dev->block_num;
++      dcr->StartFile = dev->file;
++   } else {
++      dcr->StartBlock = (uint32_t)dev->file_addr;
++      dcr->StartFile  = (uint32_t)(dev->file_addr >> 32);
++   }
++}
++
+ /*
+  * We have a new Volume mounted, so reset the Volume parameters
+  *  concerning this job.  The global changes were made earlier
+@@ -208,24 +221,11 @@
+ void set_new_volume_parameters(DCR *dcr)
+ {
+    JCR *jcr = dcr->jcr;
+-   DEVICE *dev = dcr->dev;
+    if (dcr->NewVol && !dir_get_volume_info(dcr, GET_VOL_INFO_FOR_WRITE)) {
+       Jmsg1(jcr, M_ERROR, 0, "%s", jcr->errmsg);
+    }
+-   /* Set new start/end positions */
+-   if (dev->is_tape()) {
+-      dcr->StartBlock = dev->block_num;
+-      dcr->StartFile = dev->file;
+-   } else {
+-      dcr->StartBlock = (uint32_t)dev->file_addr;
+-      dcr->StartFile  = (uint32_t)(dev->file_addr >> 32);
+-   }
+-   /* Reset indicies */
+-   dcr->VolFirstIndex = 0;
+-   dcr->VolLastIndex = 0;
++   set_new_file_parameters(dcr);
+    jcr->NumWriteVolumes++;
+-   dcr->NewVol = false;
+-   dcr->WroteVol = false;
+ }
+ 
+ /*
+@@ -235,16 +235,8 @@
+  */
+ void set_new_file_parameters(DCR *dcr)
+ {
+-   DEVICE *dev = dcr->dev;
++   set_start_vol_position(dcr);
+ 
+-   /* Set new start/end positions */
+-   if (dev->is_tape()) {
+-      dcr->StartBlock = dev->block_num;
+-      dcr->StartFile = dev->file;
+-   } else {
+-      dcr->StartBlock = (uint32_t)dev->file_addr;
+-      dcr->StartFile  = (uint32_t)(dev->file_addr >> 32);
+-   }
+    /* Reset indicies */
+    dcr->VolFirstIndex = 0;
+    dcr->VolLastIndex = 0;
+Index: src/stored/mac.c
+===================================================================
+--- src/stored/mac.c	(revision 6391)
++++ src/stored/mac.c	(working copy)
+@@ -1,15 +1,7 @@
+ /*
+- * SD -- mac.c --  responsible for doing
+- *     migration, archive, and copy jobs.
+- *
+- *     Kern Sibbald, January MMVI
+- *
+- *   Version $Id$
+- */
+-/*
+    Bacula® - The Network Backup Solution
+ 
+-   Copyright (C) 2006-2006 Free Software Foundation Europe e.V.
++   Copyright (C) 2006-2008 Free Software Foundation Europe e.V.
+ 
+    The main author of Bacula is Kern Sibbald, with contributions from
+    many others, a complete list can be found in the file AUTHORS.
+@@ -33,6 +25,14 @@
+    (FSFE), Fiduciary Program, Sumatrastrasse 25, 8006 Zürich,
+    Switzerland, email:ftf at fsfeurope.org.
+ */
++/*
++ * SD -- mac.c --  responsible for doing
++ *     migration, archive, and copy jobs.
++ *
++ *     Kern Sibbald, January MMVI
++ *
++ *   Version $Id$
++ */
+ 
+ #include "bacula.h"
+ #include "stored.h"
+@@ -108,6 +108,7 @@
+ 
+    jcr->dcr->VolFirstIndex = jcr->dcr->VolLastIndex = 0;
+    jcr->run_time = time(NULL);
++   set_start_vol_position(jcr->dcr);
+ 
+    ok = read_records(jcr->read_dcr, record_cb, mount_next_read_volume);
+    goto ok_out;
+Index: src/stored/protos.h
+===================================================================
+--- src/stored/protos.h	(revision 6391)
++++ src/stored/protos.h	(working copy)
+@@ -126,6 +126,7 @@
+ bool     open_device(DCR *dcr);
+ bool     first_open_device(DCR *dcr);
+ bool     fixup_device_block_write_error(DCR *dcr);
++void     set_start_vol_position(DCR *dcr);
+ void     set_new_volume_parameters(DCR *dcr);
+ void     set_new_file_parameters(DCR *dcr);
+ bool     is_device_unmounted(DEVICE *dev);

================================================================
Index: SOURCES/2.2.8-pool-source.patch
diff -u /dev/null SOURCES/2.2.8-pool-source.patch:1.1
--- /dev/null	Sat Mar  7 11:44:20 2009
+++ SOURCES/2.2.8-pool-source.patch	Sat Mar  7 11:44:06 2009
@@ -0,0 +1,29 @@
+
+ This patch fixes bug #1031 about wrong pool source information
+ in job report.
+
+ Apply the patch to 2.2.8 (and possibly any 2.2.x version with):
+
+ cd <bacula-source>
+ patch -p0 <2.2.8-pool-source.patch
+ ./configure <your-options>
+ make
+ ...
+ make install
+
+
+
+Index: src/dird/ua_run.c
+===================================================================
+--- src/dird/ua_run.c	(révision 6388)
++++ src/dird/ua_run.c	(copie de travail)
+@@ -122,6 +122,9 @@
+    jcr->verify_job = rc.verify_job;
+    jcr->previous_job = rc.previous_job;
+    jcr->pool = rc.pool;
++   if (jcr->pool != jcr->job->pool) {
++      pm_strcpy(jcr->pool_source, _("User input"));
++   }
+    set_rwstorage(jcr, rc.store);
+    jcr->client = rc.client;
+    pm_strcpy(jcr->client_name, rc.client->name());

================================================================
Index: SOURCES/2.2.8-strip-path.patch
<<Diff was trimmed, longer than 597 lines>>

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/0250-out_of_source_build.diff?r1=1.1&r2=1.2&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/0255-qtreeview-selection-columns-hidden.diff?r1=1.1&r2=1.2&f=u



More information about the pld-cvs-commit mailing list