From e55fe7db716fc054533e40b4a79807151b8df535 Mon Sep 17 00:00:00 2001
From: Przemyslaw Czerpak <druzus@priv.onet.pl>
Date: Mon, 13 Sep 2010 10:13:04 +0000
Subject: [PATCH] 2010-09-13 12:12 UTC+0200 Przemyslaw Czerpak
 (druzus/at/priv.onet.pl)   * harbour/package/harbour-win.spec.in   *
 harbour/package/harbour-wce.spec.in     ! added HB_BUILD_EXTDEF=no to fix
 cross compilation       Question: in the past HB_BUILD_EXTDEF=no was set
 automatically                 for cross compilation. Why we removed this
 setting?

  * harbour/package/harbour.spec
    ! use libhbqt*.a for Harbour QT wrapper libraries instead of explicit
      names which were not correctly synced.

  * harbour/contrib/xhb/xhbmsgs.c
    ! fixed assign last character in string using [] operators in
      xHarbour emulation library, i.e.;
         cVal[ len( cVal ) ] := "*"
---
 harbour/ChangeLog                   | 16 ++++++++++++++++
 harbour/contrib/xhb/xhbmsgs.c       |  2 +-
 harbour/package/harbour-wce.spec.in |  2 ++
 harbour/package/harbour-win.spec.in |  2 ++
 harbour/package/harbour.spec        |  5 +----
 5 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 702a0facf2..8768f2202b 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -16,6 +16,22 @@
    The license applies to all entries newer than 2009-04-28.
 */
 
+2010-09-13 12:12 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
+  * harbour/package/harbour-win.spec.in
+  * harbour/package/harbour-wce.spec.in
+    ! added HB_BUILD_EXTDEF=no to fix cross compilation
+      Question: in the past HB_BUILD_EXTDEF=no was set automatically
+                for cross compilation. Why we removed this setting?
+
+  * harbour/package/harbour.spec
+    ! use libhbqt*.a for Harbour QT wrapper libraries instead of explicit
+      names which were not correctly synced.
+
+  * harbour/contrib/xhb/xhbmsgs.c
+    ! fixed assign last character in string using [] operators in
+      xHarbour emulation library, i.e.;
+         cVal[ len( cVal ) ] := "*"
+
 2010-09-13 11:40 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
   * harbour/src/rtl/hbzlib.c
     + added new PRG function:
diff --git a/harbour/contrib/xhb/xhbmsgs.c b/harbour/contrib/xhb/xhbmsgs.c
index 9642e6ab21..59a1b422ec 100644
--- a/harbour/contrib/xhb/xhbmsgs.c
+++ b/harbour/contrib/xhb/xhbmsgs.c
@@ -343,7 +343,7 @@ HB_FUNC( XHB_INDEX )
                {
                   char * pszText;
                   if( hb_itemGetWriteCL( pSelf, &pszText, &nLen ) &&
-                      nIndex < nLen )
+                      nIndex > 0 && nIndex <= nLen )
                      pszText[ nIndex - 1 ] = cValue;
                }
             }
diff --git a/harbour/package/harbour-wce.spec.in b/harbour/package/harbour-wce.spec.in
index 4df1ebe28c..cc74e76ce1 100644
--- a/harbour/package/harbour-wce.spec.in
+++ b/harbour/package/harbour-wce.spec.in
@@ -83,6 +83,7 @@ unset HB_BUILD_CONTRIBS
 export HB_BUILD_PARTS=lib
 export HB_PLATFORM=wce
 export HB_HOST_BIN="$(pwd)/bin/linux/gcc"
+export HB_BUILD_EXTDEF=no
 
 make %{?_smp_mflags}
 
@@ -99,6 +100,7 @@ unset HB_COMPILER
 export HB_BUILD_PARTS=lib
 export HB_PLATFORM=wce
 export HB_HOST_BIN="$(pwd)/bin/linux/gcc"
+export HB_BUILD_EXTDEF=no
 
 export HB_INSTALL_PKG_ROOT=${RPM_BUILD_ROOT}
 export HB_INSTALL_BIN=${RPM_BUILD_ROOT}/%{_bindir}
diff --git a/harbour/package/harbour-win.spec.in b/harbour/package/harbour-win.spec.in
index 3848510fd5..35a55b042a 100644
--- a/harbour/package/harbour-win.spec.in
+++ b/harbour/package/harbour-win.spec.in
@@ -83,6 +83,7 @@ unset HB_BUILD_CONTRIBS
 export HB_BUILD_PARTS=lib
 export HB_PLATFORM=win
 export HB_HOST_BIN="$(pwd)/bin/linux/gcc"
+export HB_BUILD_EXTDEF=no
 
 make %{?_smp_mflags}
 
@@ -99,6 +100,7 @@ unset HB_COMPILER
 export HB_BUILD_PARTS=lib
 export HB_PLATFORM=win
 export HB_HOST_BIN="$(pwd)/bin/linux/gcc"
+export HB_BUILD_EXTDEF=no
 
 export HB_INSTALL_PKG_ROOT=${RPM_BUILD_ROOT}
 export HB_INSTALL_BIN=${RPM_BUILD_ROOT}/%{_bindir}
diff --git a/harbour/package/harbour.spec b/harbour/package/harbour.spec
index abd0542306..bf4cfbf69a 100644
--- a/harbour/package/harbour.spec
+++ b/harbour/package/harbour.spec
@@ -588,10 +588,7 @@ rm -rf $RPM_BUILD_ROOT
 %{?_with_qt:%files qt}
 %{?_with_qt:%defattr(644,root,root,755)}
 %{?_with_qt:%dir %{_libdir}/%{name}}
-%{?_with_qt:%{_libdir}/%{name}/libhbqt.a}
-%{?_with_qt:%{_libdir}/%{name}/libhbqtcore.a}
-%{?_with_qt:%{_libdir}/%{name}/libhbqtgui.a}
-%{?_with_qt:%{_libdir}/%{name}/libhbqtnetwork.a}
+%{?_with_qt:%{_libdir}/%{name}/libhbqt*.a}
 %{?_with_qt:%{_libdir}/%{name}/libhbxbp.a}
 
 ######################################################################