2013-06-04 14:20 UTC+0200 Przemyslaw Czerpak (druzus/at/poczta.onet.pl)

* contrib/gtqtc/gtqtc1.cpp
    * added workaround for missing MT synchronization in QT for XLIB
      QT was designed to use screen widgets only in main thread so
      it's only workaround which helps but I cannot guaranti

  * contrib/hbmzip/mzip.c
    * workaround for wrong st_mtime type in struct stat on android

  * src/rtl/hbsocket.c
    * do not check if IPPROTO_IP is defined, on some platforms like
      android it's only enum type. Warning if it exploits some problems
      on some seldom used platforms/compilers then please report it.

  * src/vm/hvm.c
    * minor

  * package/mpkg_ver.sh
    * do not use bash extensions

  * package/harbour-wce.spec.in
  * package/harbour-win.spec.in
  * package/harbour.spec
  * package/mpkg_rpm.sh
  * package/mpkg_rpm_wce.sh
  * package/mpkg_rpm_win.sh
    * removed bash from dependencies list
This commit is contained in:
Przemysław Czerpak
2013-06-04 14:20:50 +02:00
parent d900dc5b1c
commit 8b963cf79d
12 changed files with 72 additions and 18 deletions

View File

@@ -32,8 +32,8 @@ License: GPL (plus exception)
Group: Development/Languages
URL: http://harbour-project.org/
Source: harbour-%{version}.src.tar.gz
BuildPrereq: gcc binutils bash
Requires: gcc binutils bash sh-utils cegcc-mingw32ce harbour = %{?epoch:%{epoch}:}%{version}-%{release}
BuildPrereq: gcc binutils
Requires: gcc binutils sh-utils cegcc-mingw32ce harbour = %{?epoch:%{epoch}:}%{version}-%{release}
Provides: %{name}
BuildRoot: /tmp/%{name}-%{version}-root

View File

@@ -32,8 +32,8 @@ License: GPL (plus exception)
Group: Development/Languages
URL: http://harbour-project.org/
Source: harbour-%{version}.src.tar.gz
BuildPrereq: gcc binutils bash
Requires: gcc binutils bash sh-utils harbour = %{?epoch:%{epoch}:}%{version}-%{release}
BuildPrereq: gcc binutils
Requires: gcc binutils sh-utils harbour = %{?epoch:%{epoch}:}%{version}-%{release}
Provides: %{name}
BuildRoot: /tmp/%{name}-%{version}-root

View File

@@ -92,8 +92,8 @@ License: GPL (plus exception)
Group: Development/Languages
URL: http://harbour-project.org/
Source: %{name}-%{version}.src.tar.gz
BuildPrereq: gcc binutils bash %{!?_without_curses: ncurses-devel} %{!?_without_gpm: gpm-devel}
Requires: gcc binutils bash sh-utils %{name}-lib = %{?epoch:%{epoch}:}%{version}-%{release}
BuildPrereq: gcc binutils %{!?_without_curses: ncurses-devel} %{!?_without_gpm: gpm-devel}
Requires: gcc binutils sh-utils %{name}-lib = %{?epoch:%{epoch}:}%{version}-%{release}
Provides: %{name} harbour lib%{name}.so
BuildRoot: /tmp/%{name}-%{version}-root

View File

@@ -12,7 +12,7 @@ test_reqrpm()
rpm -q --whatprovides "$1" >/dev/null 2>&1
}
NEED_RPM="make gcc binutils bash"
NEED_RPM="make gcc binutils"
FORCE=""

View File

@@ -38,7 +38,7 @@ hb_ver=`get_hbver`
hb_verstat=`get_hbverstat`
[ -n "${hb_verstat}" ] || hb_verstat="0"
NEED_RPM="make gcc binutils bash cegcc-mingw32ce"
NEED_RPM="make gcc binutils cegcc-mingw32ce"
FORCE=""

View File

@@ -59,7 +59,7 @@ hb_ver=`get_hbver`
hb_verstat=`get_hbverstat`
[ -n "${hb_verstat}" ] || hb_verstat="0"
NEED_RPM="make gcc binutils bash"
NEED_RPM="make gcc binutils"
FORCE=""

View File

@@ -3,14 +3,13 @@
# ---------------------------------------------------------------
# Copyright 2003 Przemyslaw Czerpak <druzus@priv.onet.pl>
# small set of functions used by Harbour scripts
# warning: some bash extensions are used
#
# See COPYING.txt for licensing terms.
# ---------------------------------------------------------------
get_hbver()
{
hb_rootdir="${1-..}"
if [ -z "$hb_rootdir" ]; then hb_rootdir=".."; fi
FVER="${hb_rootdir}/include/hbver.h"
MAJOR=`sed -e '/HB_VER_MAJOR/ !d' -e 's/[^0-9]*\([^ ]*\).*/\1/g' "${FVER}"`
MINOR=`sed -e '/HB_VER_MINOR/ !d' -e 's/[^0-9]*\([^ ]*\).*/\1/g' "${FVER}"`
@@ -20,7 +19,7 @@ get_hbver()
get_hbverstat()
{
hb_rootdir="${1-..}"
if [ -z "$hb_rootdir" ]; then hb_rootdir=".."; fi
FVER="${hb_rootdir}/include/hbver.h"
VERSTAT=`sed -e '/HB_VER_STATUS/ !d' -e 's/[^\"]*\"\([^\"]*\).*/\1/g' "${FVER}"`
echo "${VERSTAT}"