From 60d14a931a205363be1d8f8e1fd323cd8d6e0db3 Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Thu, 22 Apr 2010 16:14:08 +0000 Subject: [PATCH] 2010-04-22 18:12 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) * INSTALL + Added information for CUPS. * mpkg_rpm.sh * harbour.spec * contrib/hbcups/Makefile + Added remaining bits for CUPS dependency. ; Pls verify .rpm package name, I couldn't try it. * contrib/hbcups/Makefile - Deleted unnecessary autodetection path. --- harbour/ChangeLog | 28 +++++++++++++++++++++------- harbour/INSTALL | 6 ++++++ harbour/contrib/hbcups/Makefile | 2 +- harbour/harbour.spec | 22 +++++++++++++++++++++- harbour/mpkg_rpm.sh | 4 ++++ 5 files changed, 53 insertions(+), 9 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index da424e20e5..8a5d51f733 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -17,17 +17,31 @@ past entries belonging to author(s): Viktor Szakats. */ +2010-04-22 18:12 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) + * INSTALL + + Added information for CUPS. + + * mpkg_rpm.sh + * harbour.spec + * contrib/hbcups/Makefile + + Added remaining bits for CUPS dependency. + + ; Pls verify .rpm package name, I couldn't try it. + + * contrib/hbcups/Makefile + - Deleted unnecessary autodetection path. + 2010-04-22 18:45 UTC+0300 Mindaugas Kavaliauskas (dbtopas/at/dbtopas.lt) * harbour/contrib/rddads/ads1.c - ! Fixed date handling in area putValue method for .dbf tables. - ADS does not support dates smaller than 0001-01-01 and stores - invalid values in .dbf without any error. F.e., 0000-01-01 is - stored as '-0011231', CTOD("")+5 is stored as '****1128'. Such - invalid filed values generates ADS runtime error 5095 later on + ! Fixed date handling in area putValue method for .dbf tables. + ADS does not support dates smaller than 0001-01-01 and stores + invalid values in .dbf without any error. F.e., 0000-01-01 is + stored as '-0011231', CTOD("")+5 is stored as '****1128'. Such + invalid filed values generates ADS runtime error 5095 later on getValue area method. DBF RDD stores empty dates in case of unsupported date range. - This fix makes ADS RDD behaviour more compatible to DBF RDD. - ADSADT behaviour is not changed because ADS allows to store + This fix makes ADS RDD behaviour more compatible to DBF RDD. + ADSADT behaviour is not changed because ADS allows to store and retrieve field values for dates before 0001-01-01. 2010-04-22 17:31 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) diff --git a/harbour/INSTALL b/harbour/INSTALL index 105bdba7d8..98d07196e7 100644 --- a/harbour/INSTALL +++ b/harbour/INSTALL @@ -222,6 +222,7 @@ HARBOUR --with static - link all binaries with static libs --with ads - build components dependent on ads (rddads) --with allegro - build components dependent on allegro (gtalleg) + --with cups - build components dependent on cups (hbcups) --with cairo - build components dependent on cairo (hbcairo) --with curl - build components dependent on libcurl (hbcurl) --with firebird - build components dependent on firebird (hbfbird, sddfb) @@ -300,6 +301,7 @@ HARBOUR HB_WITH_BLAT=C:\blat\full\source HB_WITH_BZIP2=C:\bzip2 (defaults to locally hosted version if not found) HB_WITH_CAIRO=C:\cairo\include\cairo + HB_WITH_CUPS= (on *nix only) HB_WITH_CURL=C:\curl\include HB_WITH_CURSES= (on *nix systems and DJGPP, where it's autodetected) HB_WITH_FIREBIRD=C:\Firebird\include @@ -379,6 +381,7 @@ HARBOUR $ sudo apt-get install libgpmg1-dev for contrib/gtalleg lib: $ sudo apt-get install liballegro4.2-dev for contrib/hbcairo lib: $ sudo apt-get install libcairo2-dev + for contrib/hbcups lib: $ sudo apt-get install libcups2-dev for contrib/hbcurl lib: $ sudo apt-get install libcurl4-openssl-dev OR $ sudo apt-get install libcurl4-gnutls-dev for contrib/hbfbird lib: $ sudo apt-get install firebird2.1-dev OR @@ -415,6 +418,7 @@ HARBOUR gpm for contrib/gtalleg lib: allegro-devel for contrib/hbcairo lib: cairo-devel + for contrib/hbcups lib: libcups2-devel for contrib/hbcurl lib: curl-devel for contrib/hbfbird lib: firebird-devel for contrib/hbfimage lib: freeimage-devel @@ -1349,6 +1353,8 @@ HARBOUR http://ftp.gnome.org/pub/gnome/binaries/win32/dependencies/cairo-dev_1.8.8-2_win32.zip http://ftp.gnome.org/pub/gnome/binaries/win32/dependencies/cairo_1.8.8-2_win32.zip http://ftp.gnome.org/pub/gnome/binaries/win32/dependencies/libpng_1.2.39-1_win32.zip + HB_WITH_CUPS - libcups (printing) [*nix, free, open-source] + http://www.cups.org/ HB_WITH_CURL - libcurl (file transfer) [multiplatform, free, open-source] http://curl.haxx.se/ HB_WITH_FIREBIRD - firebird SQL [multiplatform, free, open-source] diff --git a/harbour/contrib/hbcups/Makefile b/harbour/contrib/hbcups/Makefile index 0eaee358ac..a6fd6decc6 100644 --- a/harbour/contrib/hbcups/Makefile +++ b/harbour/contrib/hbcups/Makefile @@ -16,7 +16,7 @@ _DET_VAR_INC_ := HB_INC_CUPS _DET_VAR_HAS_ := HB_HAS_CUPS _DET_FLT_PLAT := _DET_FLT_COMP := -_DET_INC_DEFP := /usr/include /opt/local/include +_DET_INC_DEFP := /usr/include _DET_INC_HEAD := /cups/cups.h include $(TOP)$(ROOT)config/detfun.mk diff --git a/harbour/harbour.spec b/harbour/harbour.spec index 455d70282d..662f6c7725 100644 --- a/harbour/harbour.spec +++ b/harbour/harbour.spec @@ -69,7 +69,7 @@ %define hb_ldir export HB_LIB_INSTALL=%{_libdir}/%{name} %define hb_edir export HB_ETC_INSTALL=%{hb_etcdir} %define hb_cmrc export HB_BUILD_NOGPLLIB=%{?_without_gpllib:yes} -%define hb_ctrb export HB_CONTRIBLIBS="hbblink hbbtree hbclipsm hbct hbgt hbmisc hbmzip hbnetio hbtip hbtpathy hbhpdf hbziparc hbfoxpro hbfship hbxpp xhb rddbmcdx rddsql sddsqlt3 hbnf %{?_with_allegro:gtalleg} %{?_with_cairo:hbcairo} %{?_with_curl:hbcurl} %{?_with_firebird:hbfbird sddfb} %{?_with_freeimage:hbfimage} %{?_with_gd:hbgd} %{?_with_mysql:hbmysql sddmy} %{?_with_odbc:hbodbc sddodbc} %{?_with_pgsql:hbpgsql sddpg} %{?_with_qt:hbqt hbxbp} %{?_with_ads:rddads}" +%define hb_ctrb export HB_CONTRIBLIBS="hbblink hbbtree hbclipsm hbct hbgt hbmisc hbmzip hbnetio hbtip hbtpathy hbhpdf hbziparc hbfoxpro hbfship hbxpp xhb rddbmcdx rddsql sddsqlt3 hbnf %{?_with_allegro:gtalleg} %{?_with_cairo:hbcairo} %{?_with_cups:hbcups} %{?_with_curl:hbcurl} %{?_with_firebird:hbfbird sddfb} %{?_with_freeimage:hbfimage} %{?_with_gd:hbgd} %{?_with_mysql:hbmysql sddmy} %{?_with_odbc:hbodbc sddodbc} %{?_with_pgsql:hbpgsql sddpg} %{?_with_qt:hbqt hbxbp} %{?_with_ads:rddads}" %define hb_env %{hb_plat} ; %{hb_cc} ; %{hb_cflag} ; %{hb_lflag} ; %{hb_dflag} ; %{hb_gpm} ; %{hb_crs} ; %{hb_sln} ; %{hb_x11} ; %{hb_local} ; %{hb_bdir} ; %{hb_idir} ; %{hb_ldir} ; %{hb_edir} ; %{hb_ctrb} ; %{hb_cmrc} %define hb_host www.harbour-project.org %define readme README.RPM @@ -247,6 +247,21 @@ statikus szerkeszt %{?_with_cairo:%{dname} to kompatybilny z językiem CA-Cl*pper kompilator.} %{?_with_cairo:Ten pakiet udostępnia statyczn+ biliotekę Cairo dla kompilatora %{dname}.} +## cups library +%{?_with_cups:%package cups} +%{?_with_cups:Summary: CUPS library bindings for %{dname} compiler} +%{?_with_cups:Summary(pl): Bilioteka CUPS dla kompilatora %{dname}} +%{?_with_cups:Group: Development/Languages} +%{?_with_cups:Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}} + +%{?_with_cups:%description cups} +%{?_with_cups:%{dname} is a Clipper compatible compiler.} +%{?_with_cups:This package provides %{dname} CUPS library for program linking.} + +%{?_with_cups:%description -l pl cups} +%{?_with_cups:%{dname} to kompatybilny z językiem CA-Cl*pper kompilator.} +%{?_with_cups:Ten pakiet udostępnia statyczn+ biliotekę CUPS dla kompilatora %{dname}.} + ## curl library %{?_with_curl:%package curl} %{?_with_curl:Summary: CURL library bindings for %{dname} compiler} @@ -656,6 +671,11 @@ rm -rf $RPM_BUILD_ROOT %{?_with_cairo:%dir %{_libdir}/%{name}} %{?_with_cairo:%{_libdir}/%{name}/libhbcairo.a} +%{?_with_cups:%files cups} +%{?_with_cups:%defattr(644,root,root,755)} +%{?_with_cups:%dir %{_libdir}/%{name}} +%{?_with_cups:%{_libdir}/%{name}/libhbcups.a} + %{?_with_curl:%files curl} %{?_with_curl:%defattr(644,root,root,755)} %{?_with_curl:%dir %{_libdir}/%{name}} diff --git a/harbour/mpkg_rpm.sh b/harbour/mpkg_rpm.sh index 224387b396..5c9531d72a 100755 --- a/harbour/mpkg_rpm.sh +++ b/harbour/mpkg_rpm.sh @@ -86,6 +86,10 @@ if test_reqrpm "cairo-devel" then INST_PARAM="${INST_PARAM} --with cairo" fi +if test_reqrpm "libcups2-devel" +then + INST_PARAM="${INST_PARAM} --with cups" +fi if test_reqrpm "curl-devel" then INST_PARAM="${INST_PARAM} --with curl"