From c035333f28b920467820e016daa9f3138fe8ae8f Mon Sep 17 00:00:00 2001
From: Claudio Valerio <claudio@sente.ch>
Date: Mon, 5 Sep 2011 09:53:18 +0200
Subject: [PATCH 1/2] fixed issue http://188.165.53.52/jira/browse/SANKORE-107

---
 src/domain/UBGraphicsPixmapItem.cpp       | 2 +-
 src/domain/UBGraphicsTextItemDelegate.cpp | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/domain/UBGraphicsPixmapItem.cpp b/src/domain/UBGraphicsPixmapItem.cpp
index 49154ca6..edffb90d 100644
--- a/src/domain/UBGraphicsPixmapItem.cpp
+++ b/src/domain/UBGraphicsPixmapItem.cpp
@@ -25,7 +25,7 @@
 
 #include "core/memcheck.h"
 
-UBGraphicsPixmapItem::UBGraphicsPixmapItem(QGraphicsItem* parent/*, QString pSource*/)
+UBGraphicsPixmapItem::UBGraphicsPixmapItem(QGraphicsItem* parent)
     : QGraphicsPixmapItem(parent)
 {
     mDelegate = new UBGraphicsItemDelegate(this, 0, true, true);
diff --git a/src/domain/UBGraphicsTextItemDelegate.cpp b/src/domain/UBGraphicsTextItemDelegate.cpp
index 0f7a32f5..1ab6dc3f 100644
--- a/src/domain/UBGraphicsTextItemDelegate.cpp
+++ b/src/domain/UBGraphicsTextItemDelegate.cpp
@@ -31,7 +31,7 @@
 const int UBGraphicsTextItemDelegate::sMinPixelSize = 8;
 
 UBGraphicsTextItemDelegate::UBGraphicsTextItemDelegate(UBGraphicsTextItem* pDelegated, QObject * parent)
-    : UBGraphicsItemDelegate(pDelegated,0, parent, false)
+    : UBGraphicsItemDelegate(pDelegated,0, parent, true)
     , mLastFontPixelSize(-1)
 {
     // NOOP

From c33d6a290c41565f07ac452bc32543cad8de151e Mon Sep 17 00:00:00 2001
From: Anatoly Mihalchenko <tolik@scand.com>
Date: Mon, 5 Sep 2011 11:21:33 +0300
Subject: [PATCH 2/2] Adopt for linix-g++ spec

---
 Sankore_3.1.pro               | 19 ++++++++++++++++++-
 src/desktop/desktop.pri       |  1 +
 src/frameworks/frameworks.pri |  7 ++++++-
 src/gui/gui.pri               |  5 +++++
 src/pdf-merger/pdfMerger.pri  |  7 ++++++-
 5 files changed, 36 insertions(+), 3 deletions(-)

diff --git a/Sankore_3.1.pro b/Sankore_3.1.pro
index b10b733f..273cc9e8 100644
--- a/Sankore_3.1.pro
+++ b/Sankore_3.1.pro
@@ -86,6 +86,7 @@ BUILD_DIR = build
 macx:BUILD_DIR = $$BUILD_DIR/macx
 win32:BUILD_DIR = $$BUILD_DIR/win32
 linux-g++:BUILD_DIR = $$BUILD_DIR/linux
+linux-g++-32:BUILD_DIR = $$BUILD_DIR/linux
 linux-g++-64:BUILD_DIR = $$BUILD_DIR/linux
 
 CONFIG(debug, debug|release):BUILD_DIR = $$BUILD_DIR/debug
@@ -109,7 +110,7 @@ win32 {
    QMAKE_CXXFLAGS_RELEASE += /Od \
        /Zi
    QMAKE_LFLAGS_RELEASE += /DEBUG
-   UB_LIBRARY.path = $$DESTDIR
+   UB_LIBRARY.path = DESTDIR
    UB_I18N.path = $$DESTDIR/i18n
    UB_ETC.path = $$DESTDIR
    UB_THIRDPARTY_INTERACTIVE.path = $$DESTDIR/library
@@ -117,6 +118,7 @@ win32 {
    system(echo "$$VERSION" > $$BUILD_DIR/version)
    system(echo "$$LONG_VERSION" > $$BUILD_DIR/longversion)
    system(echo "$$SVN_VERSION" > $$BUILD_DIR/svnversion)
+
 }
 
 macx {
@@ -323,6 +325,21 @@ linux-g++ {
    system(echo "$$SVN_VERSION" > $$BUILD_DIR/svnversion)
 }
 
+linux-g++-32 {
+   LIBS += -lcrypto
+   QMAKE_CFLAGS += -fopenmp
+   QMAKE_CXXFLAGS += -fopenmp
+   QMAKE_LFLAGS += -fopenmp
+   UB_LIBRARY.path = $$DESTDIR
+   UB_I18N.path = $$DESTDIR/i18n
+   UB_ETC.path = $$DESTDIR
+   UB_THIRDPARTY_INTERACTIVE.path = $$DESTDIR/library
+   system(mkdir -p $$BUILD_DIR)
+   system(echo "$$VERSION" > $$BUILD_DIR/version)
+   system(echo "$$LONG_VERSION" > $$BUILD_DIR/longversion)
+   system(echo "$$SVN_VERSION" > $$BUILD_DIR/svnversion)
+}
+
 linux-g++-64 { 
     LIBS += -lcrypto
     QMAKE_CFLAGS += -fopenmp
diff --git a/src/desktop/desktop.pri b/src/desktop/desktop.pri
index 390a2df6..eda60eb0 100644
--- a/src/desktop/desktop.pri
+++ b/src/desktop/desktop.pri
@@ -24,3 +24,4 @@ win32 {
 macx:SOURCES += src/desktop/UBWindowCapture_mac.mm
 
 linux-g++:SOURCES += src/desktop/UBWindowCapture_linux.cpp
+linux-g++-32:SOURCES += src/desktop/UBWindowCapture_linux.cpp
diff --git a/src/frameworks/frameworks.pri b/src/frameworks/frameworks.pri
index a706ff93..e38a9aa1 100644
--- a/src/frameworks/frameworks.pri
+++ b/src/frameworks/frameworks.pri
@@ -38,4 +38,9 @@ linux-g++ {
 
     SOURCES  += src/frameworks/UBPlatformUtils_linux.cpp \
                 src/frameworks/UBDesktopServices_linux.cpp
-}         
\ No newline at end of file
+}         
+linux-g++-32 {
+
+    SOURCES  += src/frameworks/UBPlatformUtils_linux.cpp \
+                src/frameworks/UBDesktopServices_linux.cpp
+}
diff --git a/src/gui/gui.pri b/src/gui/gui.pri
index 6d933785..530421d1 100644
--- a/src/gui/gui.pri
+++ b/src/gui/gui.pri
@@ -108,3 +108,8 @@ linux-g++ {
 
     SOURCES  += src/gui/UBKeyboardPalette_linux.cpp
 }
+
+linux-g++-32 {
+
+    SOURCES  += src/gui/UBKeyboardPalette_linux.cpp
+}
diff --git a/src/pdf-merger/pdfMerger.pri b/src/pdf-merger/pdfMerger.pri
index 2617a624..c976b39d 100644
--- a/src/pdf-merger/pdfMerger.pri
+++ b/src/pdf-merger/pdfMerger.pri
@@ -72,4 +72,9 @@ linux-g++ {
 
    LIBS += -lz
 
-}
\ No newline at end of file
+}
+linux-g++-32 {
+
+   LIBS += -lz
+
+}