mirror of
git://slackware.nl/current.git
synced 2024-12-30 10:24:23 +01:00
acab1eb58e
a/eudev-3.2.5-x86_64-4.txz: Upgraded.
More bugs, unreplaced macros, and systemd-specific stuff have been found in
the eudev-3.2.6 release. Since there don't seem to be any improvements that
would merit closely following the bleeding edge on this one, we'll revert
back to eudev-3.2.5 which worked fine.
a/kernel-firmware-20181001_7c81f23-noarch-1.txz: Upgraded.
ap/at-3.1.23-x86_64-1.txz: Upgraded.
ap/hplip-3.18.9-x86_64-1.txz: Upgraded.
d/mercurial-4.7.2-x86_64-1.txz: Upgraded.
x/libpthread-stubs-0.4-x86_64-3.txz: Rebuilt.
Rebuilt since this should not be "noarch".
xap/mozilla-firefox-60.2.2esr-x86_64-1.txz: Upgraded.
This release contains security fixes and improvements.
For more information, see:
https://www.mozilla.org/security/known-vulnerabilities/firefoxESR.html
https://www.mozilla.org/en-US/security/advisories/mfsa2018-24/
https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2018-12387
(* Security fix *)
xap/mozilla-thunderbird-60.2.1-x86_64-1.txz: Upgraded.
This is a bugfix release. For more information, see:
https://www.mozilla.org/en-US/thunderbird/60.2.1/releasenotes/
xfce/Thunar-1.8.2-x86_64-1.txz: Upgraded.
50 lines
1.8 KiB
Diff
50 lines
1.8 KiB
Diff
From 1bd330a5240519781fe325c75c29de43ab0ffb29 Mon Sep 17 00:00:00 2001
|
|
From: Till Kamppeter <till.kamppeter@canonical.com>
|
|
Date: Sat, 24 Sep 2016 10:37:20 +0200
|
|
Subject: Add 'include <cups/ppd.h>' 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 bf3902b84..f12eda941 100755
|
|
--- a/configure.in
|
|
+++ b/configure.in
|
|
@@ -591,7 +591,7 @@ fi
|
|
|
|
if test "$class_driver" = "no" && 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 3d003d5d2..60f858025 100644
|
|
--- a/prnt/hpcups/HPCupsFilter.h
|
|
+++ b/prnt/hpcups/HPCupsFilter.h
|
|
@@ -38,6 +38,8 @@
|
|
#include <cups/ppd.h>
|
|
#include "dbuscomm.h"
|
|
|
|
+#include <cups/ppd.h>
|
|
+
|
|
#define DBITMAPFILEHEADER 14
|
|
#define DBITMAPINFOHEADER 40
|
|
|
|
diff --git a/prnt/hpijs/hpcupsfax.cpp b/prnt/hpijs/hpcupsfax.cpp
|
|
index 8514775d4..994e50f39 100644
|
|
--- a/prnt/hpijs/hpcupsfax.cpp
|
|
+++ b/prnt/hpijs/hpcupsfax.cpp
|
|
@@ -43,6 +43,7 @@
|
|
#include <arpa/inet.h>
|
|
#include <math.h>
|
|
#include <cups/cups.h>
|
|
+#include <cups/ppd.h>
|
|
#include <cups/raster.h>
|
|
#include <string>
|
|
#ifdef FALSE
|