SF.net SVN: gar:[23303] csw/mgar/pkg/hplip/trunk
cgrzemba at users.sourceforge.net
cgrzemba at users.sourceforge.net
Mon Mar 31 13:26:12 CEST 2014
Revision: 23303
http://sourceforge.net/p/gar/code/23303
Author: cgrzemba
Date: 2014-03-31 11:26:07 +0000 (Mon, 31 Mar 2014)
Log Message:
-----------
hplip/trunk: update version, add tools
Modified Paths:
--------------
csw/mgar/pkg/hplip/trunk/Makefile
Added Paths:
-----------
csw/mgar/pkg/hplip/trunk/files/0005-set-csw-path-utils.h.patch
csw/mgar/pkg/hplip/trunk/files/0006-set-csw-path-hpps.patch
csw/mgar/pkg/hplip/trunk/files/0007-swap-ldflags-Makefile.in.patch
csw/mgar/pkg/hplip/trunk/files/0008-add-strcasestr-hp.c.patch
csw/mgar/pkg/hplip/trunk/files/0009-add-getdomainname-def-HPCupsFilter.cpp.patch
csw/mgar/pkg/hplip/trunk/files/0010-include-math.h.ErnieFilter.cpp.patch
Modified: csw/mgar/pkg/hplip/trunk/Makefile
===================================================================
--- csw/mgar/pkg/hplip/trunk/Makefile 2014-03-31 10:57:43 UTC (rev 23302)
+++ csw/mgar/pkg/hplip/trunk/Makefile 2014-03-31 11:26:07 UTC (rev 23303)
@@ -1,5 +1,5 @@
NAME = hplip
-VERSION = 3.13.3
+VERSION = 3.14.3
GARTYPE = v2
MASTER_SITES = http://prdownloads.sourceforge.net/hplip/
@@ -24,14 +24,31 @@
PATCHFILES += 0001-add-strnlen.patch
PATCHFILES += 0002-set-csw-path-hpijs.cpp.patch
PATCHFILES += 0004-set-csw-path-foomatic-rip-hplip.patch
+PATCHFILES += 0005-set-csw-path-utils.h.patch
+PATCHFILES += 0006-set-csw-path-hpps.patch
+PATCHFILES += 0007-swap-ldflags-Makefile.in.patch
+PATCHFILES += 0008-add-strcasestr-hp.c.patch
+PATCHFILES += 0009-add-getdomainname-def-HPCupsFilter.cpp.patch
+PATCHFILES += 0010-include-math.h.ErnieFilter.cpp.patch
-EXTRA_LINKER_FLAGS += -norunpath -xnorunpath
+EXTRA_LINKER_FLAGS_SOS12U3 += -norunpath -xnorunpath
+EXTRA_LINKER_FLAGS += $(EXTRA_LINKER_FLAGS_$(GARCOMPILER))
+EXTRA_INC += /usr/sfw/include
+EXTRA_LIB += /usr/sfw/lib
+EXTRA_CPPFLAGS_SOS12U3 += -features=extensions
+EXTRA_CPPFLAGS += $(EXTRA_CPPFLAGS_$(GARCOMPILER))
+STRIP_LIBTOOL = 1
CONFIGURE_ARGS = $(DIRPATHS)
-CONFIGURE_ARGS += --enable-hpijs-only-build
-CONFIGURE_ARGS += --enable-hpijs-install
+# CONFIGURE_ARGS += --enable-hpijs-only-build
+# CONFIGURE_ARGS += --enable-hpijs-install
CONFIGURE_ARGS += --with-hpppddir=/opt/csw/share/cups/model/HP
# CONFIGURE_ARGS += --enable-hpcups-only-build
+CONFIGURE_ARGS += --disable-network-build
+# CONFIGURE_ARGS += --disable-scan-build
+# CONFIGURE_ARGS += --disable-gui-build
+# CONFIGURE_ARGS += --disable-fax-build
+CONFIGURE_ARGS += --enable-libusb01_build
CHECKPKG_OVERRIDES_CSWhplip += file-with-bad-content|/usr/share|root/opt/csw/share/doc/$(NAME)-$(VERSION)/upgrading.html
CHECKPKG_OVERRIDES_CSWhplip += file-with-bad-content|/usr/share|root/opt/csw/share/doc/$(NAME)-$(VERSION)/uninstalling.html
@@ -40,6 +57,7 @@
post-install:
ginstall -m 755 -d $(DESTDIR)$(libdir)/cups/filter
+ ginstall -m 755 -d $(DESTDIR)$(sysconfdir)/hp
ginstall -m 755 $(WORKSRC)/prnt/filters/hpps $(DESTDIR)$(libdir)/cups/filter
- ginstall -m 755 $(WORKSRC)/prnt/filters/hpcac $(DESTDIR)$(libdir)/cups/filter
+ ginstall -m 644 $(WORKSRC)/hplip.conf $(DESTDIR)$(sysconfdir)/hp
$(MAKECOOKIES)
Added: csw/mgar/pkg/hplip/trunk/files/0005-set-csw-path-utils.h.patch
===================================================================
--- csw/mgar/pkg/hplip/trunk/files/0005-set-csw-path-utils.h.patch (rev 0)
+++ csw/mgar/pkg/hplip/trunk/files/0005-set-csw-path-utils.h.patch 2014-03-31 11:26:07 UTC (rev 23303)
@@ -0,0 +1,13 @@
+--- a/common/utils.h
++++ b/common/utils.h
+@@ -21,8 +21,8 @@
+ #define SCAN_PLUGIN_SOAP "bb_soap.so"
+ #define SCAN_PLUGIN_SOAPHT "bb_soapht.so"
+
+-#define HPLIP_PLUGIN_STATE "/var/lib/hp/hplip.state"
+-#define CUPS_TMP_DIR getenv("TMPDIR") ? : getenv("HOME") ?:"/tmp"
++#define HPLIP_PLUGIN_STATE "/var/opt/csw/lib/hp/hplip.state"
++#define CUPS_TMP_DIR getenv("TMPDIR") ? getenv("TMPDIR") : getenv("HOME") ? getenv("HOME") :"/tmp"
+
+ enum UTILS_CONF_RESULT
+ {
Added: csw/mgar/pkg/hplip/trunk/files/0006-set-csw-path-hpps.patch
===================================================================
--- csw/mgar/pkg/hplip/trunk/files/0006-set-csw-path-hpps.patch (rev 0)
+++ csw/mgar/pkg/hplip/trunk/files/0006-set-csw-path-hpps.patch 2014-03-31 11:26:07 UTC (rev 23303)
@@ -0,0 +1,20 @@
+--- a/prnt/filters/hpps
++++ b/prnt/filters/hpps
+@@ -44,7 +44,7 @@ output_fd = 1
+
+ job_id = 0
+ pid = os.getpid()
+-config_file = '/etc/hp/hplip.conf'
++config_file = '/etc/opt/csw/hp/hplip.conf'
+ home_dir = ''
+
+
+@@ -64,7 +64,7 @@ if os.path.exists(config_file):
+ bug("Error setting home directory: home= under [dirs] not found.")
+ sys.exit(CUPS_FILTER_FAILED)
+ else:
+- bug("Error setting home directory: /etc/hp/hplip.conf not found")
++ bug("Error setting home directory: %s not found" % config_file)
+ sys.exit(CUPS_FILTER_FAILED)
+
+ if not home_dir or not os.path.exists(home_dir):
Added: csw/mgar/pkg/hplip/trunk/files/0007-swap-ldflags-Makefile.in.patch
===================================================================
--- csw/mgar/pkg/hplip/trunk/files/0007-swap-ldflags-Makefile.in.patch (rev 0)
+++ csw/mgar/pkg/hplip/trunk/files/0007-swap-ldflags-Makefile.in.patch 2014-03-31 11:26:07 UTC (rev 23303)
@@ -0,0 +1,33 @@
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -306,7 +306,7 @@ am__libhpmud_la_SOURCES_DIST = io/hpmud/hpmud.c io/hpmud/mlc.c \
+ libhpmud_la_OBJECTS = $(am_libhpmud_la_OBJECTS)
+ libhpmud_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
+ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(libhpmud_la_CFLAGS) \
+- $(CFLAGS) $(libhpmud_la_LDFLAGS) $(LDFLAGS) -o $@
++ $(CFLAGS) $(LDFLAGS) $(libhpmud_la_LDFLAGS) -o $@
+ @HPLIP_BUILD_TRUE at am_libhpmud_la_rpath = -rpath $(libdir)
+ am__DEPENDENCIES_1 =
+ @HPLIP_BUILD_TRUE@@SCAN_BUILD_TRUE at libsane_hpaio_la_DEPENDENCIES = \
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -346,7 +346,7 @@ am__libsane_hpaio_la_SOURCES_DIST = scan/sane/hpaio.c \
+ libsane_hpaio_la_OBJECTS = $(am_libsane_hpaio_la_OBJECTS)
+ libsane_hpaio_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
+ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(libsane_hpaio_la_CFLAGS) \
+- $(CFLAGS) $(libsane_hpaio_la_LDFLAGS) $(LDFLAGS) -o $@
++ $(CFLAGS) $(LDFLAGS) $(libsane_hpaio_la_LDFLAGS) -o $@
+ @HPLIP_BUILD_TRUE@@SCAN_BUILD_TRUE at am_libsane_hpaio_la_rpath = -rpath \
+ @HPLIP_BUILD_TRUE@@SCAN_BUILD_TRUE@ $(libsane_hpaiodir)
+ pcardext_la_LIBADD =
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -366,7 +366,7 @@ am__scanext_la_SOURCES_DIST = scan/scanext/scanext.c
+ scanext_la_OBJECTS = $(am_scanext_la_OBJECTS)
+ scanext_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
+ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(scanext_la_CFLAGS) \
+- $(CFLAGS) $(scanext_la_LDFLAGS) $(LDFLAGS) -o $@
++ $(CFLAGS) $(LDFLAGS) $(scanext_la_LDFLAGS) -o $@
+ @FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE@@SCAN_BUILD_TRUE at am_scanext_la_rpath = \
+ @FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE@@SCAN_BUILD_TRUE@ -rpath \
+ @FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE@@SCAN_BUILD_TRUE@ $(scanextdir)
Added: csw/mgar/pkg/hplip/trunk/files/0008-add-strcasestr-hp.c.patch
===================================================================
--- csw/mgar/pkg/hplip/trunk/files/0008-add-strcasestr-hp.c.patch (rev 0)
+++ csw/mgar/pkg/hplip/trunk/files/0008-add-strcasestr-hp.c.patch 2014-03-31 11:26:07 UTC (rev 23303)
@@ -0,0 +1,41 @@
+--- a/common/utils.c
++++ b/common/utils.c
+@@ -4,6 +4,8 @@
+ #include <sys/stat.h>
+ #include <errno.h>
+ #include <stdlib.h>
++#include <string.h>
++#include <strings.h>
+
+ extern int errno;
+
+@@ -245,4 +247,16 @@ int createTempFile(char* szFileName, FILE** pFilePtr)
+ }
+
+ return iFD;
+-}
+\ No newline at end of file
++}
++
++char *strcasestr(char *a, char *b)
++{
++ size_t l;
++ char f[3];
++
++ snprintf(f, sizeof(f), "%c%c", tolower(*b), toupper(*b));
++ for (l = strcspn(a, f); l != strlen(a); l += strcspn(a + l + 1, f) + 1)
++ if (strncasecmp(a + l, b, strlen(b)) == 0)
++ return a + l;
++ return NULL;
++}
+--- a/common/utils.h
++++ b/common/utils.h
+@@ -152,6 +152,8 @@ extern "C" {
+
+ int createTempFile(char* szFileName, FILE** pFilePtr);
+
++ char *strcasestr(char *a, char *b);
++
+ #ifdef __cplusplus
+ }
+ #endif
Added: csw/mgar/pkg/hplip/trunk/files/0009-add-getdomainname-def-HPCupsFilter.cpp.patch
===================================================================
--- csw/mgar/pkg/hplip/trunk/files/0009-add-getdomainname-def-HPCupsFilter.cpp.patch (rev 0)
+++ csw/mgar/pkg/hplip/trunk/files/0009-add-getdomainname-def-HPCupsFilter.cpp.patch 2014-03-31 11:26:07 UTC (rev 23303)
@@ -0,0 +1,24 @@
+--- a/prnt/hpcups/HPCupsFilter.cpp
++++ b/prnt/hpcups/HPCupsFilter.cpp
+@@ -34,12 +34,21 @@
+ #include <signal.h>
+ #include <sys/wait.h>
+ #include <sys/utsname.h>
++#include <sys/systeminfo.h>
+ #include <time.h>
+ #include "utils.h"
+
+ #define HP_FILE_VERSION_STR "03.09.08.0"
+
+ static HPCupsFilter filter;
++int
++getdomainname(char *name, size_t namelen)
++{
++ long sysinfostatus;
++
++ sysinfostatus = sysinfo(SI_SRPC_DOMAIN, name, namelen);
++ return ((sysinfostatus < 0) ? -1 : 0);
++}
+
+ int main (int argc, char *argv[])
+ {
Added: csw/mgar/pkg/hplip/trunk/files/0010-include-math.h.ErnieFilter.cpp.patch
===================================================================
--- csw/mgar/pkg/hplip/trunk/files/0010-include-math.h.ErnieFilter.cpp.patch (rev 0)
+++ csw/mgar/pkg/hplip/trunk/files/0010-include-math.h.ErnieFilter.cpp.patch 2014-03-31 11:26:07 UTC (rev 23303)
@@ -0,0 +1,13 @@
+--- a/prnt/hpcups/ErnieFilter.cpp
++++ b/prnt/hpcups/ErnieFilter.cpp
+@@ -50,10 +50,7 @@
+ #include "ErnieFilter.h"
+
+
+-#if defined(__APPLE__) || defined(__linux) || defined(__GLIBC__) || defined(__NetBSD__)
+ #include <math.h>
+-#endif
+-
+
+ #if kGatherStats == 1
+ extern int blockStats[];
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the devel
mailing list