[arch-commits] Commit in hplip/repos/extra-x86_64 (10 files)
Date: Saturday, November 23, 2019 @ 21:45:12 Author: andyrtr Revision: 369669 archrelease: copy trunk to extra-x86_64 Added: hplip/repos/extra-x86_64/0022-Add-include-cups-ppd.h-in-various-places-as-CUPS-2.2.patch (from rev 369668, hplip/trunk/0022-Add-include-cups-ppd.h-in-various-places-as-CUPS-2.2.patch) hplip/repos/extra-x86_64/0023-Fix-handling-of-unicode-filenames-in-sixext.py.patch (from rev 369668, hplip/trunk/0023-Fix-handling-of-unicode-filenames-in-sixext.py.patch) hplip/repos/extra-x86_64/0025-Remove-all-ImageProcessor-functionality-which-is-clo.patch (from rev 369668, hplip/trunk/0025-Remove-all-ImageProcessor-functionality-which-is-clo.patch) hplip/repos/extra-x86_64/PKGBUILD (from rev 369668, hplip/trunk/PKGBUILD) hplip/repos/extra-x86_64/disable_upgrade.patch (from rev 369668, hplip/trunk/disable_upgrade.patch) Deleted: hplip/repos/extra-x86_64/0022-Add-include-cups-ppd.h-in-various-places-as-CUPS-2.2.patch hplip/repos/extra-x86_64/0023-Fix-handling-of-unicode-filenames-in-sixext.py.patch hplip/repos/extra-x86_64/0025-Remove-all-ImageProcessor-functionality-which-is-clo.patch hplip/repos/extra-x86_64/PKGBUILD hplip/repos/extra-x86_64/disable_upgrade.patch -+ 0022-Add-include-cups-ppd.h-in-various-places-as-CUPS-2.2.patch | 100 ++-- 0023-Fix-handling-of-unicode-filenames-in-sixext.py.patch | 58 +- 0025-Remove-all-ImageProcessor-functionality-which-is-clo.patch | 226 +- PKGBUILD| 175 +++ disable_upgrade.patch | 28 - 5 files changed, 295 insertions(+), 292 deletions(-) Deleted: 0022-Add-include-cups-ppd.h-in-various-places-as-CUPS-2.2.patch === --- 0022-Add-include-cups-ppd.h-in-various-places-as-CUPS-2.2.patch 2019-11-23 21:44:52 UTC (rev 369668) +++ 0022-Add-include-cups-ppd.h-in-various-places-as-CUPS-2.2.patch 2019-11-23 21:45:12 UTC (rev 369669) @@ -1,50 +0,0 @@ -From b3a7fa4d4a573cfe0073ae50197f679af7e3a0ac Mon Sep 17 00:00:00 2001 -From: Till Kamppeter -Date: Sat, 24 Sep 2016 10:37:20 +0200 -Subject: Add 'include ' in various places as CUPS 2.2 moved some - definitions to ppd.h - - configure.in | 2 +- - prnt/hpcups/HPCupsFilter.h | 2 ++ - prnt/hpijs/hpcupsfax.cpp | 1 + - 3 files changed, 4 insertions(+), 1 deletion(-) - -diff --git a/configure.in b/configure.in -index d3a1ddb..eabe14a 100755 a/configure.in -+++ b/configure.in -@@ -554,7 +554,7 @@ fi - - if test "$hpijs_only_build" = "no" && test "$hpcups_only_build" = "no"; then -AC_CHECK_LIB([cups], [cupsDoFileRequest], [LIBS="$LIBS"], [AC_MSG_ERROR([cannot find libcups support], 9)]) -- AC_CHECK_HEADERS(cups/cups.h, ,[AC_MSG_ERROR([cannot find cups-devel support], 3)]) -+ AC_CHECK_HEADERS(cups/cups.h cups/ppd.h, ,[AC_MSG_ERROR([cannot find cups-devel support], 3)]) -if test "$libusb01_build" = "yes"; then - AC_CHECK_LIB([usb], [usb_init], [LIBS="$LIBS"], [AC_MSG_ERROR([cannot find libusb support], 2)]) - AC_CHECK_HEADERS(usb.h, ,[AC_MSG_ERROR([cannot find libusb-devel support], 11)]) -diff --git a/prnt/hpcups/HPCupsFilter.h b/prnt/hpcups/HPCupsFilter.h -index ff5548e..c517989 100644 a/prnt/hpcups/HPCupsFilter.h -+++ b/prnt/hpcups/HPCupsFilter.h -@@ -38,6 +38,8 @@ - - #include "dbuscomm.h" - -+#include -+ - #define DBITMAPFILEHEADER 14 - #define DBITMAPINFOHEADER 40 - -diff --git a/prnt/hpijs/hpcupsfax.cpp b/prnt/hpijs/hpcupsfax.cpp -index 8514775..994e50f 100644 a/prnt/hpijs/hpcupsfax.cpp -+++ b/prnt/hpijs/hpcupsfax.cpp -@@ -43,6 +43,7 @@ - #include - #include - #include -+#include - #include - #include - #ifdef FALSE Copied: hplip/repos/extra-x86_64/0022-Add-include-cups-ppd.h-in-various-places-as-CUPS-2.2.patch (from rev 369668, hplip/trunk/0022-Add-include-cups-ppd.h-in-various-places-as-CUPS-2.2.patch) === --- 0022-Add-include-cups-ppd.h-in-various-places-as-CUPS-2.2.patch (rev 0) +++ 0022-Add-include-cups-ppd.h-in-various-places-as-CUPS-2.2.patch 2019-11-23 21:45:12 UTC (rev 369669) @@ -0,0 +1,50 @@ +From b3a7fa4d4a573cfe0073ae50197f679af7e3a0ac Mon Sep 17 00:00:00 2001 +From: Till Kamppeter +Date: Sat, 24 Sep 2016 10:37:20 +0200 +Subject: Add 'include ' in various places as CUPS 2.2 moved some + definitions to ppd.h + +--- + configure.in | 2 +- + prnt/hpcups/HPCupsFilter.h | 2 ++ + prnt/hpijs/hpcupsfax.cpp | 1 + + 3 files changed, 4 insertions(+), 1 deletion(-) + +diff --git a/configure.in b/configure.in +index d3a1ddb..eabe14a 100755 +--- a/configure.in b/configure.in +@@ -554,7 +554,7 @@ fi + + if test "$hpijs_only_build" = "no" && test
[arch-commits] Commit in hplip/repos/extra-x86_64 (10 files)
Date: Sunday, November 17, 2019 @ 17:52:40 Author: andyrtr Revision: 368994 archrelease: copy trunk to extra-x86_64 Added: hplip/repos/extra-x86_64/0022-Add-include-cups-ppd.h-in-various-places-as-CUPS-2.2.patch (from rev 368993, hplip/trunk/0022-Add-include-cups-ppd.h-in-various-places-as-CUPS-2.2.patch) hplip/repos/extra-x86_64/0023-Fix-handling-of-unicode-filenames-in-sixext.py.patch (from rev 368993, hplip/trunk/0023-Fix-handling-of-unicode-filenames-in-sixext.py.patch) hplip/repos/extra-x86_64/0025-Remove-all-ImageProcessor-functionality-which-is-clo.patch (from rev 368993, hplip/trunk/0025-Remove-all-ImageProcessor-functionality-which-is-clo.patch) hplip/repos/extra-x86_64/PKGBUILD (from rev 368993, hplip/trunk/PKGBUILD) hplip/repos/extra-x86_64/disable_upgrade.patch (from rev 368993, hplip/trunk/disable_upgrade.patch) Deleted: hplip/repos/extra-x86_64/0022-Add-include-cups-ppd.h-in-various-places-as-CUPS-2.2.patch hplip/repos/extra-x86_64/0023-Fix-handling-of-unicode-filenames-in-sixext.py.patch hplip/repos/extra-x86_64/0025-Remove-all-ImageProcessor-functionality-which-is-clo.patch hplip/repos/extra-x86_64/PKGBUILD hplip/repos/extra-x86_64/disable_upgrade.patch -+ 0022-Add-include-cups-ppd.h-in-various-places-as-CUPS-2.2.patch | 100 ++-- 0023-Fix-handling-of-unicode-filenames-in-sixext.py.patch | 58 +- 0025-Remove-all-ImageProcessor-functionality-which-is-clo.patch | 226 +- PKGBUILD| 172 +++ disable_upgrade.patch | 28 - 5 files changed, 292 insertions(+), 292 deletions(-) Deleted: 0022-Add-include-cups-ppd.h-in-various-places-as-CUPS-2.2.patch === --- 0022-Add-include-cups-ppd.h-in-various-places-as-CUPS-2.2.patch 2019-11-17 17:52:28 UTC (rev 368993) +++ 0022-Add-include-cups-ppd.h-in-various-places-as-CUPS-2.2.patch 2019-11-17 17:52:40 UTC (rev 368994) @@ -1,50 +0,0 @@ -From b3a7fa4d4a573cfe0073ae50197f679af7e3a0ac Mon Sep 17 00:00:00 2001 -From: Till Kamppeter -Date: Sat, 24 Sep 2016 10:37:20 +0200 -Subject: Add 'include ' in various places as CUPS 2.2 moved some - definitions to ppd.h - - configure.in | 2 +- - prnt/hpcups/HPCupsFilter.h | 2 ++ - prnt/hpijs/hpcupsfax.cpp | 1 + - 3 files changed, 4 insertions(+), 1 deletion(-) - -diff --git a/configure.in b/configure.in -index d3a1ddb..eabe14a 100755 a/configure.in -+++ b/configure.in -@@ -554,7 +554,7 @@ fi - - if test "$hpijs_only_build" = "no" && test "$hpcups_only_build" = "no"; then -AC_CHECK_LIB([cups], [cupsDoFileRequest], [LIBS="$LIBS"], [AC_MSG_ERROR([cannot find libcups support], 9)]) -- AC_CHECK_HEADERS(cups/cups.h, ,[AC_MSG_ERROR([cannot find cups-devel support], 3)]) -+ AC_CHECK_HEADERS(cups/cups.h cups/ppd.h, ,[AC_MSG_ERROR([cannot find cups-devel support], 3)]) -if test "$libusb01_build" = "yes"; then - AC_CHECK_LIB([usb], [usb_init], [LIBS="$LIBS"], [AC_MSG_ERROR([cannot find libusb support], 2)]) - AC_CHECK_HEADERS(usb.h, ,[AC_MSG_ERROR([cannot find libusb-devel support], 11)]) -diff --git a/prnt/hpcups/HPCupsFilter.h b/prnt/hpcups/HPCupsFilter.h -index ff5548e..c517989 100644 a/prnt/hpcups/HPCupsFilter.h -+++ b/prnt/hpcups/HPCupsFilter.h -@@ -38,6 +38,8 @@ - - #include "dbuscomm.h" - -+#include -+ - #define DBITMAPFILEHEADER 14 - #define DBITMAPINFOHEADER 40 - -diff --git a/prnt/hpijs/hpcupsfax.cpp b/prnt/hpijs/hpcupsfax.cpp -index 8514775..994e50f 100644 a/prnt/hpijs/hpcupsfax.cpp -+++ b/prnt/hpijs/hpcupsfax.cpp -@@ -43,6 +43,7 @@ - #include - #include - #include -+#include - #include - #include - #ifdef FALSE Copied: hplip/repos/extra-x86_64/0022-Add-include-cups-ppd.h-in-various-places-as-CUPS-2.2.patch (from rev 368993, hplip/trunk/0022-Add-include-cups-ppd.h-in-various-places-as-CUPS-2.2.patch) === --- 0022-Add-include-cups-ppd.h-in-various-places-as-CUPS-2.2.patch (rev 0) +++ 0022-Add-include-cups-ppd.h-in-various-places-as-CUPS-2.2.patch 2019-11-17 17:52:40 UTC (rev 368994) @@ -0,0 +1,50 @@ +From b3a7fa4d4a573cfe0073ae50197f679af7e3a0ac Mon Sep 17 00:00:00 2001 +From: Till Kamppeter +Date: Sat, 24 Sep 2016 10:37:20 +0200 +Subject: Add 'include ' in various places as CUPS 2.2 moved some + definitions to ppd.h + +--- + configure.in | 2 +- + prnt/hpcups/HPCupsFilter.h | 2 ++ + prnt/hpijs/hpcupsfax.cpp | 1 + + 3 files changed, 4 insertions(+), 1 deletion(-) + +diff --git a/configure.in b/configure.in +index d3a1ddb..eabe14a 100755 +--- a/configure.in b/configure.in +@@ -554,7 +554,7 @@ fi + + if test "$hpijs_only_build" = "no" && test
[arch-commits] Commit in hplip/repos/extra-x86_64 (10 files)
Date: Wednesday, August 28, 2019 @ 16:09:07 Author: andyrtr Revision: 361329 archrelease: copy trunk to extra-x86_64 Added: hplip/repos/extra-x86_64/0022-Add-include-cups-ppd.h-in-various-places-as-CUPS-2.2.patch (from rev 361328, hplip/trunk/0022-Add-include-cups-ppd.h-in-various-places-as-CUPS-2.2.patch) hplip/repos/extra-x86_64/0023-Fix-handling-of-unicode-filenames-in-sixext.py.patch (from rev 361328, hplip/trunk/0023-Fix-handling-of-unicode-filenames-in-sixext.py.patch) hplip/repos/extra-x86_64/0025-Remove-all-ImageProcessor-functionality-which-is-clo.patch (from rev 361328, hplip/trunk/0025-Remove-all-ImageProcessor-functionality-which-is-clo.patch) hplip/repos/extra-x86_64/PKGBUILD (from rev 361328, hplip/trunk/PKGBUILD) hplip/repos/extra-x86_64/disable_upgrade.patch (from rev 361328, hplip/trunk/disable_upgrade.patch) Deleted: hplip/repos/extra-x86_64/0022-Add-include-cups-ppd.h-in-various-places-as-CUPS-2.2.patch hplip/repos/extra-x86_64/0023-Fix-handling-of-unicode-filenames-in-sixext.py.patch hplip/repos/extra-x86_64/0025-Remove-all-ImageProcessor-functionality-which-is-clo.patch hplip/repos/extra-x86_64/PKGBUILD hplip/repos/extra-x86_64/disable_upgrade.patch -+ 0022-Add-include-cups-ppd.h-in-various-places-as-CUPS-2.2.patch | 100 ++-- 0023-Fix-handling-of-unicode-filenames-in-sixext.py.patch | 58 +- 0025-Remove-all-ImageProcessor-functionality-which-is-clo.patch | 226 +- PKGBUILD| 170 +++ disable_upgrade.patch | 28 - 5 files changed, 291 insertions(+), 291 deletions(-) Deleted: 0022-Add-include-cups-ppd.h-in-various-places-as-CUPS-2.2.patch === --- 0022-Add-include-cups-ppd.h-in-various-places-as-CUPS-2.2.patch 2019-08-28 16:08:59 UTC (rev 361328) +++ 0022-Add-include-cups-ppd.h-in-various-places-as-CUPS-2.2.patch 2019-08-28 16:09:07 UTC (rev 361329) @@ -1,50 +0,0 @@ -From b3a7fa4d4a573cfe0073ae50197f679af7e3a0ac Mon Sep 17 00:00:00 2001 -From: Till Kamppeter -Date: Sat, 24 Sep 2016 10:37:20 +0200 -Subject: Add 'include ' in various places as CUPS 2.2 moved some - definitions to ppd.h - - configure.in | 2 +- - prnt/hpcups/HPCupsFilter.h | 2 ++ - prnt/hpijs/hpcupsfax.cpp | 1 + - 3 files changed, 4 insertions(+), 1 deletion(-) - -diff --git a/configure.in b/configure.in -index d3a1ddb..eabe14a 100755 a/configure.in -+++ b/configure.in -@@ -554,7 +554,7 @@ fi - - if test "$hpijs_only_build" = "no" && test "$hpcups_only_build" = "no"; then -AC_CHECK_LIB([cups], [cupsDoFileRequest], [LIBS="$LIBS"], [AC_MSG_ERROR([cannot find libcups support], 9)]) -- AC_CHECK_HEADERS(cups/cups.h, ,[AC_MSG_ERROR([cannot find cups-devel support], 3)]) -+ AC_CHECK_HEADERS(cups/cups.h cups/ppd.h, ,[AC_MSG_ERROR([cannot find cups-devel support], 3)]) -if test "$libusb01_build" = "yes"; then - AC_CHECK_LIB([usb], [usb_init], [LIBS="$LIBS"], [AC_MSG_ERROR([cannot find libusb support], 2)]) - AC_CHECK_HEADERS(usb.h, ,[AC_MSG_ERROR([cannot find libusb-devel support], 11)]) -diff --git a/prnt/hpcups/HPCupsFilter.h b/prnt/hpcups/HPCupsFilter.h -index ff5548e..c517989 100644 a/prnt/hpcups/HPCupsFilter.h -+++ b/prnt/hpcups/HPCupsFilter.h -@@ -38,6 +38,8 @@ - - #include "dbuscomm.h" - -+#include -+ - #define DBITMAPFILEHEADER 14 - #define DBITMAPINFOHEADER 40 - -diff --git a/prnt/hpijs/hpcupsfax.cpp b/prnt/hpijs/hpcupsfax.cpp -index 8514775..994e50f 100644 a/prnt/hpijs/hpcupsfax.cpp -+++ b/prnt/hpijs/hpcupsfax.cpp -@@ -43,6 +43,7 @@ - #include - #include - #include -+#include - #include - #include - #ifdef FALSE Copied: hplip/repos/extra-x86_64/0022-Add-include-cups-ppd.h-in-various-places-as-CUPS-2.2.patch (from rev 361328, hplip/trunk/0022-Add-include-cups-ppd.h-in-various-places-as-CUPS-2.2.patch) === --- 0022-Add-include-cups-ppd.h-in-various-places-as-CUPS-2.2.patch (rev 0) +++ 0022-Add-include-cups-ppd.h-in-various-places-as-CUPS-2.2.patch 2019-08-28 16:09:07 UTC (rev 361329) @@ -0,0 +1,50 @@ +From b3a7fa4d4a573cfe0073ae50197f679af7e3a0ac Mon Sep 17 00:00:00 2001 +From: Till Kamppeter +Date: Sat, 24 Sep 2016 10:37:20 +0200 +Subject: Add 'include ' in various places as CUPS 2.2 moved some + definitions to ppd.h + +--- + configure.in | 2 +- + prnt/hpcups/HPCupsFilter.h | 2 ++ + prnt/hpijs/hpcupsfax.cpp | 1 + + 3 files changed, 4 insertions(+), 1 deletion(-) + +diff --git a/configure.in b/configure.in +index d3a1ddb..eabe14a 100755 +--- a/configure.in b/configure.in +@@ -554,7 +554,7 @@ fi + + if test "$hpijs_only_build" = "no" && test
[arch-commits] Commit in hplip/repos/extra-x86_64 (10 files)
Date: Saturday, June 29, 2019 @ 12:07:59 Author: andyrtr Revision: 357055 archrelease: copy trunk to extra-x86_64 Added: hplip/repos/extra-x86_64/0022-Add-include-cups-ppd.h-in-various-places-as-CUPS-2.2.patch (from rev 357054, hplip/trunk/0022-Add-include-cups-ppd.h-in-various-places-as-CUPS-2.2.patch) hplip/repos/extra-x86_64/0023-Fix-handling-of-unicode-filenames-in-sixext.py.patch (from rev 357054, hplip/trunk/0023-Fix-handling-of-unicode-filenames-in-sixext.py.patch) hplip/repos/extra-x86_64/0025-Remove-all-ImageProcessor-functionality-which-is-clo.patch (from rev 357054, hplip/trunk/0025-Remove-all-ImageProcessor-functionality-which-is-clo.patch) hplip/repos/extra-x86_64/PKGBUILD (from rev 357054, hplip/trunk/PKGBUILD) hplip/repos/extra-x86_64/disable_upgrade.patch (from rev 357054, hplip/trunk/disable_upgrade.patch) Deleted: hplip/repos/extra-x86_64/0022-Add-include-cups-ppd.h-in-various-places-as-CUPS-2.2.patch hplip/repos/extra-x86_64/0023-Fix-handling-of-unicode-filenames-in-sixext.py.patch hplip/repos/extra-x86_64/0025-Remove-all-ImageProcessor-functionality-which-is-clo.patch hplip/repos/extra-x86_64/PKGBUILD hplip/repos/extra-x86_64/disable_upgrade.patch -+ 0022-Add-include-cups-ppd.h-in-various-places-as-CUPS-2.2.patch | 100 ++-- 0023-Fix-handling-of-unicode-filenames-in-sixext.py.patch | 58 +- 0025-Remove-all-ImageProcessor-functionality-which-is-clo.patch | 226 +- PKGBUILD| 170 +++ disable_upgrade.patch | 28 - 5 files changed, 291 insertions(+), 291 deletions(-) Deleted: 0022-Add-include-cups-ppd.h-in-various-places-as-CUPS-2.2.patch === --- 0022-Add-include-cups-ppd.h-in-various-places-as-CUPS-2.2.patch 2019-06-29 12:07:47 UTC (rev 357054) +++ 0022-Add-include-cups-ppd.h-in-various-places-as-CUPS-2.2.patch 2019-06-29 12:07:59 UTC (rev 357055) @@ -1,50 +0,0 @@ -From b3a7fa4d4a573cfe0073ae50197f679af7e3a0ac Mon Sep 17 00:00:00 2001 -From: Till Kamppeter -Date: Sat, 24 Sep 2016 10:37:20 +0200 -Subject: Add 'include ' in various places as CUPS 2.2 moved some - definitions to ppd.h - - configure.in | 2 +- - prnt/hpcups/HPCupsFilter.h | 2 ++ - prnt/hpijs/hpcupsfax.cpp | 1 + - 3 files changed, 4 insertions(+), 1 deletion(-) - -diff --git a/configure.in b/configure.in -index d3a1ddb..eabe14a 100755 a/configure.in -+++ b/configure.in -@@ -554,7 +554,7 @@ fi - - if test "$hpijs_only_build" = "no" && test "$hpcups_only_build" = "no"; then -AC_CHECK_LIB([cups], [cupsDoFileRequest], [LIBS="$LIBS"], [AC_MSG_ERROR([cannot find libcups support], 9)]) -- AC_CHECK_HEADERS(cups/cups.h, ,[AC_MSG_ERROR([cannot find cups-devel support], 3)]) -+ AC_CHECK_HEADERS(cups/cups.h cups/ppd.h, ,[AC_MSG_ERROR([cannot find cups-devel support], 3)]) -if test "$libusb01_build" = "yes"; then - AC_CHECK_LIB([usb], [usb_init], [LIBS="$LIBS"], [AC_MSG_ERROR([cannot find libusb support], 2)]) - AC_CHECK_HEADERS(usb.h, ,[AC_MSG_ERROR([cannot find libusb-devel support], 11)]) -diff --git a/prnt/hpcups/HPCupsFilter.h b/prnt/hpcups/HPCupsFilter.h -index ff5548e..c517989 100644 a/prnt/hpcups/HPCupsFilter.h -+++ b/prnt/hpcups/HPCupsFilter.h -@@ -38,6 +38,8 @@ - - #include "dbuscomm.h" - -+#include -+ - #define DBITMAPFILEHEADER 14 - #define DBITMAPINFOHEADER 40 - -diff --git a/prnt/hpijs/hpcupsfax.cpp b/prnt/hpijs/hpcupsfax.cpp -index 8514775..994e50f 100644 a/prnt/hpijs/hpcupsfax.cpp -+++ b/prnt/hpijs/hpcupsfax.cpp -@@ -43,6 +43,7 @@ - #include - #include - #include -+#include - #include - #include - #ifdef FALSE Copied: hplip/repos/extra-x86_64/0022-Add-include-cups-ppd.h-in-various-places-as-CUPS-2.2.patch (from rev 357054, hplip/trunk/0022-Add-include-cups-ppd.h-in-various-places-as-CUPS-2.2.patch) === --- 0022-Add-include-cups-ppd.h-in-various-places-as-CUPS-2.2.patch (rev 0) +++ 0022-Add-include-cups-ppd.h-in-various-places-as-CUPS-2.2.patch 2019-06-29 12:07:59 UTC (rev 357055) @@ -0,0 +1,50 @@ +From b3a7fa4d4a573cfe0073ae50197f679af7e3a0ac Mon Sep 17 00:00:00 2001 +From: Till Kamppeter +Date: Sat, 24 Sep 2016 10:37:20 +0200 +Subject: Add 'include ' in various places as CUPS 2.2 moved some + definitions to ppd.h + +--- + configure.in | 2 +- + prnt/hpcups/HPCupsFilter.h | 2 ++ + prnt/hpijs/hpcupsfax.cpp | 1 + + 3 files changed, 4 insertions(+), 1 deletion(-) + +diff --git a/configure.in b/configure.in +index d3a1ddb..eabe14a 100755 +--- a/configure.in b/configure.in +@@ -554,7 +554,7 @@ fi + + if test "$hpijs_only_build" = "no" && test
[arch-commits] Commit in hplip/repos/extra-x86_64 (10 files)
Date: Thursday, May 16, 2019 @ 17:44:11 Author: andyrtr Revision: 353472 archrelease: copy trunk to extra-x86_64 Added: hplip/repos/extra-x86_64/0022-Add-include-cups-ppd.h-in-various-places-as-CUPS-2.2.patch (from rev 353471, hplip/trunk/0022-Add-include-cups-ppd.h-in-various-places-as-CUPS-2.2.patch) hplip/repos/extra-x86_64/0023-Fix-handling-of-unicode-filenames-in-sixext.py.patch (from rev 353471, hplip/trunk/0023-Fix-handling-of-unicode-filenames-in-sixext.py.patch) hplip/repos/extra-x86_64/0025-Remove-all-ImageProcessor-functionality-which-is-clo.patch (from rev 353471, hplip/trunk/0025-Remove-all-ImageProcessor-functionality-which-is-clo.patch) hplip/repos/extra-x86_64/PKGBUILD (from rev 353471, hplip/trunk/PKGBUILD) hplip/repos/extra-x86_64/disable_upgrade.patch (from rev 353471, hplip/trunk/disable_upgrade.patch) Deleted: hplip/repos/extra-x86_64/0022-Add-include-cups-ppd.h-in-various-places-as-CUPS-2.2.patch hplip/repos/extra-x86_64/0023-Fix-handling-of-unicode-filenames-in-sixext.py.patch hplip/repos/extra-x86_64/0025-Remove-all-ImageProcessor-functionality-which-is-clo.patch hplip/repos/extra-x86_64/PKGBUILD hplip/repos/extra-x86_64/disable_upgrade.patch -+ 0022-Add-include-cups-ppd.h-in-various-places-as-CUPS-2.2.patch | 100 ++-- 0023-Fix-handling-of-unicode-filenames-in-sixext.py.patch | 58 +- 0025-Remove-all-ImageProcessor-functionality-which-is-clo.patch | 226 +- PKGBUILD| 170 +++ disable_upgrade.patch | 28 - 5 files changed, 291 insertions(+), 291 deletions(-) Deleted: 0022-Add-include-cups-ppd.h-in-various-places-as-CUPS-2.2.patch === --- 0022-Add-include-cups-ppd.h-in-various-places-as-CUPS-2.2.patch 2019-05-16 17:43:57 UTC (rev 353471) +++ 0022-Add-include-cups-ppd.h-in-various-places-as-CUPS-2.2.patch 2019-05-16 17:44:11 UTC (rev 353472) @@ -1,50 +0,0 @@ -From b3a7fa4d4a573cfe0073ae50197f679af7e3a0ac Mon Sep 17 00:00:00 2001 -From: Till Kamppeter -Date: Sat, 24 Sep 2016 10:37:20 +0200 -Subject: Add 'include ' in various places as CUPS 2.2 moved some - definitions to ppd.h - - configure.in | 2 +- - prnt/hpcups/HPCupsFilter.h | 2 ++ - prnt/hpijs/hpcupsfax.cpp | 1 + - 3 files changed, 4 insertions(+), 1 deletion(-) - -diff --git a/configure.in b/configure.in -index d3a1ddb..eabe14a 100755 a/configure.in -+++ b/configure.in -@@ -554,7 +554,7 @@ fi - - if test "$hpijs_only_build" = "no" && test "$hpcups_only_build" = "no"; then -AC_CHECK_LIB([cups], [cupsDoFileRequest], [LIBS="$LIBS"], [AC_MSG_ERROR([cannot find libcups support], 9)]) -- AC_CHECK_HEADERS(cups/cups.h, ,[AC_MSG_ERROR([cannot find cups-devel support], 3)]) -+ AC_CHECK_HEADERS(cups/cups.h cups/ppd.h, ,[AC_MSG_ERROR([cannot find cups-devel support], 3)]) -if test "$libusb01_build" = "yes"; then - AC_CHECK_LIB([usb], [usb_init], [LIBS="$LIBS"], [AC_MSG_ERROR([cannot find libusb support], 2)]) - AC_CHECK_HEADERS(usb.h, ,[AC_MSG_ERROR([cannot find libusb-devel support], 11)]) -diff --git a/prnt/hpcups/HPCupsFilter.h b/prnt/hpcups/HPCupsFilter.h -index ff5548e..c517989 100644 a/prnt/hpcups/HPCupsFilter.h -+++ b/prnt/hpcups/HPCupsFilter.h -@@ -38,6 +38,8 @@ - - #include "dbuscomm.h" - -+#include -+ - #define DBITMAPFILEHEADER 14 - #define DBITMAPINFOHEADER 40 - -diff --git a/prnt/hpijs/hpcupsfax.cpp b/prnt/hpijs/hpcupsfax.cpp -index 8514775..994e50f 100644 a/prnt/hpijs/hpcupsfax.cpp -+++ b/prnt/hpijs/hpcupsfax.cpp -@@ -43,6 +43,7 @@ - #include - #include - #include -+#include - #include - #include - #ifdef FALSE Copied: hplip/repos/extra-x86_64/0022-Add-include-cups-ppd.h-in-various-places-as-CUPS-2.2.patch (from rev 353471, hplip/trunk/0022-Add-include-cups-ppd.h-in-various-places-as-CUPS-2.2.patch) === --- 0022-Add-include-cups-ppd.h-in-various-places-as-CUPS-2.2.patch (rev 0) +++ 0022-Add-include-cups-ppd.h-in-various-places-as-CUPS-2.2.patch 2019-05-16 17:44:11 UTC (rev 353472) @@ -0,0 +1,50 @@ +From b3a7fa4d4a573cfe0073ae50197f679af7e3a0ac Mon Sep 17 00:00:00 2001 +From: Till Kamppeter +Date: Sat, 24 Sep 2016 10:37:20 +0200 +Subject: Add 'include ' in various places as CUPS 2.2 moved some + definitions to ppd.h + +--- + configure.in | 2 +- + prnt/hpcups/HPCupsFilter.h | 2 ++ + prnt/hpijs/hpcupsfax.cpp | 1 + + 3 files changed, 4 insertions(+), 1 deletion(-) + +diff --git a/configure.in b/configure.in +index d3a1ddb..eabe14a 100755 +--- a/configure.in b/configure.in +@@ -554,7 +554,7 @@ fi + + if test "$hpijs_only_build" = "no" && test "$hpcups_only_build"
