diff options
Diffstat (limited to 'print/hplip/files/patch-hplip-plugin')
| -rw-r--r-- | print/hplip/files/patch-hplip-plugin | 30 |
1 files changed, 13 insertions, 17 deletions
diff --git a/print/hplip/files/patch-hplip-plugin b/print/hplip/files/patch-hplip-plugin index b0f55eb9af43..3090346fc280 100644 --- a/print/hplip/files/patch-hplip-plugin +++ b/print/hplip/files/patch-hplip-plugin @@ -1,22 +1,19 @@ -diff -ru hplip-3.11.12.DIST/Makefile.in hplip-3.11.12/Makefile.in ---- Makefile.in 2011-12-09 12:23:55.000000000 +0100 -+++ Makefile.in 2011-12-30 16:28:26.255313535 +0100 -@@ -503,7 +503,7 @@ +--- ./Makefile.in.orig 2014-01-08 09:33:45.000000000 +0000 ++++ ./Makefile.in 2014-01-22 20:28:18.950635134 +0000 +@@ -511,7 +511,7 @@ @HPIJS_INSTALL_TRUE@@HPLIP_BUILD_TRUE@ $(am__DEPENDENCIES_1) hpijs_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ --mode=link $(CXXLD) $(hpijs_CXXFLAGS) $(CXXFLAGS) \ - $(AM_LDFLAGS) $(LDFLAGS) -o $@ + $(AM_LDFLAGS) $(LDFLAGS) -Wl,--export-dynamic -o $@ - am__hplipjs_SOURCES_DIST = prnt/filters/hplipjs.c - @FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE@am_hplipjs_OBJECTS = \ - @FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE@ hplipjs.$(OBJEXT) -Only in hplip-3.11.12: dd -diff -ru hplip-3.11.12.DIST/prnt/hpijs/hpijs.cpp hplip-3.11.12/prnt/hpijs/hpijs.cpp ---- prnt/hpijs/hpijs.cpp 2011-12-09 12:18:33.000000000 +0100 -+++ prnt/hpijs/hpijs.cpp 2011-12-30 16:27:10.976752128 +0100 -@@ -43,6 +43,9 @@ - #include "hpijs.h" + am__hppgsz_SOURCES_DIST = prnt/hpijs/PrinterProperties.cpp \ + prnt/hpijs/PrinterProperties.h prnt/hpijs/bug.h + @FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE@am_hppgsz_OBJECTS = hppgsz-PrinterProperties.$(OBJEXT) +--- ./prnt/hpijs/hpijs.cpp.orig 2014-01-08 09:28:31.000000000 +0000 ++++ ./prnt/hpijs/hpijs.cpp 2014-01-22 20:27:15.921633756 +0000 +@@ -44,6 +44,9 @@ #include "services.h" + #include "utils.h" +#undef stderr; +FILE *stderr; @@ -24,12 +21,11 @@ diff -ru hplip-3.11.12.DIST/prnt/hpijs/hpijs.cpp hplip-3.11.12/prnt/hpijs/hpijs. extern void SendDbusMessage (const char *dev, const char *printer, int code, const char *username, const int jobid, const char *title); -@@ -586,6 +589,7 @@ - int status = EXIT_FAILURE; +@@ -590,6 +593,7 @@ int ret, n, i, kn=0, width, k_width; - + char user_name[32]={0,}; + + stderr = __stderrp; openlog("hpijs", LOG_PID, LOG_DAEMON); if (argc > 1) - |