[csw-devel] SF.net SVN: gar:[17244] csw/mgar/pkg/hplip/trunk
cgrzemba at users.sourceforge.net
cgrzemba at users.sourceforge.net
Wed Feb 29 10:17:52 CET 2012
Revision: 17244
http://gar.svn.sourceforge.net/gar/?rev=17244&view=rev
Author: cgrzemba
Date: 2012-02-29 09:17:52 +0000 (Wed, 29 Feb 2012)
Log Message:
-----------
hplip/trunk: set csw paths
Modified Paths:
--------------
csw/mgar/pkg/hplip/trunk/Makefile
Added Paths:
-----------
csw/mgar/pkg/hplip/trunk/files/0001-add-strnlen.patch
csw/mgar/pkg/hplip/trunk/files/0002-set-csw-path-hpijs.cpp.patch
csw/mgar/pkg/hplip/trunk/files/0004-set-csw-path-foomatic-rip-hplip.patch
Removed Paths:
-------------
csw/mgar/pkg/hplip/trunk/files/0002-add-strnlen-def.patch
Modified: csw/mgar/pkg/hplip/trunk/Makefile
===================================================================
--- csw/mgar/pkg/hplip/trunk/Makefile 2012-02-28 13:28:08 UTC (rev 17243)
+++ csw/mgar/pkg/hplip/trunk/Makefile 2012-02-29 09:17:52 UTC (rev 17244)
@@ -20,23 +20,21 @@
PACKAGES = CSWhplip
OBSOLETED_BY_CSWhplip = CSWhpijs
SPKG_DESC_CSWhplip = $(DESCRIPTION) foomatic
+RUNTIME_DEP_PKGS_CSWhplip += CSWlibjpeg7
-PATCHFILES += 0001-replace-strnlen.patch
-PATCHFILES += 0002-add-strnlen-def.patch
+PATCHFILES += 0001-add-strnlen.patch
+PATCHFILES += 0002-set-csw-path-hpijs.cpp.patch
+PATCHFILES += 0004-set-csw-path-foomatic-rip-hplip.patch
+EXTRA_LINKER_FLAGS += -norunpath -xnorunpath
+
CONFIGURE_ARGS = $(DIRPATHS)
CONFIGURE_ARGS += --enable-hpijs-only-build
+CONFIGURE_ARGS += --enable-hpijs-install
# CONFIGURE_ARGS += --enable-hpcups-only-build
CHECKPKG_OVERRIDES_CSWhplip += file-with-bad-content|/usr/share|root/opt/csw/share/doc/hplip-3.12.2/upgrading.html
CHECKPKG_OVERRIDES_CSWhplip += file-with-bad-content|/usr/share|root/opt/csw/share/doc/hplip-3.12.2/uninstalling.html
-
include gar/category.mk
-pre-configure-modulated:
- cd $(WORKSRC) && rm ltmain.sh && libtoolize --copy --force
- cd $(WORKSRC) && aclocal
- cd $(WORKSRC) && autoconf --force
-# cd $(WORKSRC) && automake -a -c -f
- @$(MAKECOOKIE)
Added: csw/mgar/pkg/hplip/trunk/files/0001-add-strnlen.patch
===================================================================
--- csw/mgar/pkg/hplip/trunk/files/0001-add-strnlen.patch (rev 0)
+++ csw/mgar/pkg/hplip/trunk/files/0001-add-strnlen.patch 2012-02-29 09:17:52 UTC (rev 17244)
@@ -0,0 +1,49 @@
+From 143b48c61ae48dc35002a46fe0ec1e0c07e0abd7 Mon Sep 17 00:00:00 2001
+From: Carsten Grzemba <cgrzemba at opencsw.org>
+Date: Tue, 28 Feb 2012 17:09:23 +0100
+Subject: [PATCH] add strnlen
+
+---
+ prnt/hpijs/context2.cpp | 7 +++++++
+ prnt/hpijs/ljzjscolor.cpp | 7 +++++++
+ 2 files changed, 14 insertions(+), 0 deletions(-)
+
+diff --git a/prnt/hpijs/context2.cpp b/prnt/hpijs/context2.cpp
+index 92a0089..3240d7b 100644
+--- a/prnt/hpijs/context2.cpp
++++ b/prnt/hpijs/context2.cpp
+@@ -38,6 +38,13 @@
+ #include "colormatch.h"
+ //#include "bug.h"
+
++static size_t
++strnlen (const char *string, size_t maxlen)
++{
++ const char *end = (const char *)memchr (string, '\0', maxlen);
++ return end ? (size_t) (end - string) : maxlen;
++}
++
+ APDK_BEGIN_NAMESPACE
+ extern ColorMatcher* Create_ColorMatcher
+ (
+diff --git a/prnt/hpijs/ljzjscolor.cpp b/prnt/hpijs/ljzjscolor.cpp
+index ebb45e3..302da42 100644
+--- a/prnt/hpijs/ljzjscolor.cpp
++++ b/prnt/hpijs/ljzjscolor.cpp
+@@ -38,6 +38,13 @@
+ #include "ljzjs.h"
+ #include "ljzjscolor.h"
+
++static size_t
++strnlen (const char *string, size_t maxlen)
++{
++ const char *end = (const char *)memchr (string, '\0', maxlen);
++ return end ? (size_t) (end - string) : maxlen;
++}
++
+ APDK_BEGIN_NAMESPACE
+
+ #define LJZJSCOLOR2DEVICESCOUNT 8
+--
+1.7.9
+
Deleted: csw/mgar/pkg/hplip/trunk/files/0002-add-strnlen-def.patch
===================================================================
--- csw/mgar/pkg/hplip/trunk/files/0002-add-strnlen-def.patch 2012-02-28 13:28:08 UTC (rev 17243)
+++ csw/mgar/pkg/hplip/trunk/files/0002-add-strnlen-def.patch 2012-02-29 09:17:52 UTC (rev 17244)
@@ -1,26 +0,0 @@
-From 747c3b88a9b64a507e9af6c5b00f8bbc78de9795 Mon Sep 17 00:00:00 2001
-From: Carsten Grzemba <cgrzemba at opencsw.org>
-Date: Tue, 28 Feb 2012 13:35:49 +0100
-Subject: [PATCH] add strnlen def
-
----
- prnt/hpijs/config.h | 4 ++++
- 1 files changed, 4 insertions(+), 0 deletions(-)
-
-diff --git a/prnt/hpijs/config.h b/prnt/hpijs/config.h
-index 7fe03be..4be5cd5 100644
---- a/prnt/hpijs/config.h
-+++ b/prnt/hpijs/config.h
-@@ -394,4 +394,9 @@ in "auto-include.h").
- */
- //#define APDK_AUTO_INCLUDE
-
-+#if HAVE_DECL_STRNLEN == 0
-+#include <sys/types.h>
-+ size_t strnlen(const char *s,size_t maxlen);
-+#endif
-+
- #endif //APDK_CONFIG_H
---
-1.7.9
-
Added: csw/mgar/pkg/hplip/trunk/files/0002-set-csw-path-hpijs.cpp.patch
===================================================================
--- csw/mgar/pkg/hplip/trunk/files/0002-set-csw-path-hpijs.cpp.patch (rev 0)
+++ csw/mgar/pkg/hplip/trunk/files/0002-set-csw-path-hpijs.cpp.patch 2012-02-29 09:17:52 UTC (rev 17244)
@@ -0,0 +1,25 @@
+From 9f614a8c7b35954fdf61b3f794fe3e81e8eb54b7 Mon Sep 17 00:00:00 2001
+From: Carsten Grzemba <cgrzemba at opencsw.org>
+Date: Wed, 29 Feb 2012 09:50:31 +0100
+Subject: [PATCH] set csw path hpijs.cpp
+
+---
+ prnt/hpijs/hpijs.cpp | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/prnt/hpijs/hpijs.cpp b/prnt/hpijs/hpijs.cpp
+index e3af856..77da6dc 100644
+--- a/prnt/hpijs/hpijs.cpp
++++ b/prnt/hpijs/hpijs.cpp
+@@ -76,7 +76,7 @@ void setLogLevel(UXServices *pSS)
+ FILE *fp;
+ char str[258];
+ char *p;
+- fp = fopen ("/etc/cups/cupsd.conf", "r");
++ fp = fopen ("/etc/opt/csw/cups/cupsd.conf", "r");
+ if (fp == NULL)
+ return;
+ while (!feof (fp))
+--
+1.7.9
+
Added: csw/mgar/pkg/hplip/trunk/files/0004-set-csw-path-foomatic-rip-hplip.patch
===================================================================
--- csw/mgar/pkg/hplip/trunk/files/0004-set-csw-path-foomatic-rip-hplip.patch (rev 0)
+++ csw/mgar/pkg/hplip/trunk/files/0004-set-csw-path-foomatic-rip-hplip.patch 2012-02-29 09:17:52 UTC (rev 17244)
@@ -0,0 +1,38 @@
+From 66df2cbc1dd9ee5c4edd6e4212cb8a9e03e56eda Mon Sep 17 00:00:00 2001
+From: Carsten Grzemba <cgrzemba at opencsw.org>
+Date: Wed, 29 Feb 2012 09:55:30 +0100
+Subject: [PATCH 4/4] set csw path foomatic-rip-hplip
+
+---
+ prnt/hpijs/foomatic-rip-hplip | 6 +++---
+ 1 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/prnt/hpijs/foomatic-rip-hplip b/prnt/hpijs/foomatic-rip-hplip
+index dc23519..53a585e 100644
+--- a/prnt/hpijs/foomatic-rip-hplip
++++ b/prnt/hpijs/foomatic-rip-hplip
+@@ -44,10 +44,10 @@ my $ripversion='$Revision=3.0.2.131$';
+ # possibly other stuff. The default path is often fine on Linux, but
+ # may not be on other systems.
+ #
+-my $execpath = "/usr/bin:/usr/local/bin:/usr/bin:/bin";
++my $execpath = "/opt/csw/bin:/usr/bin:/usr/local/bin:/usr/bin:/bin";
+
+ # CUPS raster drivers are searched here
+-my $cupsfilterpath = "/usr/lib/cups/filter:/usr/local/lib/cups/filter:/usr/local/libexec/cups/filter:/opt/cups/filter:/usr/lib/cups/filter";
++my $cupsfilterpath = "/usr/lib/cups/filter:/opt/csw/lib/cups/filter";
+
+ # Location of the configuration file "filter.conf", this file can be
+ # used to change the settings of foomatic-rip without editing
+@@ -56,7 +56,7 @@ my $cupsfilterpath = "/usr/lib/cups/filter:/usr/local/lib/cups/filter:/usr/local
+ # "/etc/foomatic".
+ # Some versions of configure do not fully expand $sysconfdir
+ my $prefix = "/usr";
+-my $configpath = "/etc/foomatic";
++my $configpath = "/etc/opt/csw/foomatic";
+
+ # For the stuff below, the settings in the configuration file have priority.
+
+--
+1.7.9
+
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