cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- Better fix for the cups API deprecation issue

Browse Source 
- Remove unneeded patch since we have openat(5) now (and from 5.0)
- Bump revision

ajacoutot@ robert@ (maintainer) ok.
This commit is contained in:
fgsch 2012-08-12 15:13:57 +00:00
parent 167aa2e265
commit 29e9a5a126
3 changed files with 15 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
www/chromium/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.101 2012/08/04 14:46:24 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.102 2012/08/12 15:13:57 fgsch Exp $
ONLY_FOR_ARCHS= i386 amd64
@ -6,7 +6,7 @@ COMMENT= Chromium browser
V= 20.0.1132.57
DISTNAME= chromium-${V}
REVISION= 0
REVISION= 1
CATEGORIES= www

23
www/chromium/patches/patch-chrome_browser_printing_print_system_task_proxy_cc
View File

@ -1,16 +1,19 @@
$OpenBSD: patch-chrome_browser_printing_print_system_task_proxy_cc,v 1.1 2012/08/06 17:21:32 ajacoutot Exp $
$OpenBSD: patch-chrome_browser_printing_print_system_task_proxy_cc,v 1.2 2012/08/12 15:13:57 fgsch Exp $
Fix build with cups >= 1.6
error: 'ppd_attr_t* ppdFindAttr(ppd_file_t*, const char*, const char*)' is deprecated
--- chrome/browser/printing/print_system_task_proxy.cc.orig Mon Aug 6 19:18:45 2012
+++ chrome/browser/printing/print_system_task_proxy.cc Mon Aug 6 19:18:51 2012
@@ -2,6 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
--- chrome/browser/printing/print_system_task_proxy.cc.orig Mon Aug 6 19:00:35 2012
+++ chrome/browser/printing/print_system_task_proxy.cc Mon Aug 6 19:00:46 2012
@@ -444,10 +444,7 @@ bool PrintSystemTaskProxy::GetPrinterCapabilitiesCUPS(
}
}
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
+
#include "chrome/browser/printing/print_system_task_proxy.h"
- bool is_color_device = false;
- ppd_attr_t* attr = ppdFindAttr(ppd, kColorDevice, NULL);
- if (attr && attr->value)
- is_color_device = ppd->color_device;
+ bool is_color_device = ppd->color_device;
*set_color_as_default = is_color_device;
#include <ctype.h>
if (!((is_color_device && getBasicColorModelSettings(

20
www/chromium/patches/patch-chrome_browser_shell_integration_linux_cc
View File

@ -1,20 +0,0 @@
$OpenBSD: patch-chrome_browser_shell_integration_linux_cc,v 1.8 2012/07/10 09:22:34 robert Exp $
--- chrome/browser/shell_integration_linux.cc.orig Sat Jul 7 15:52:44 2012
+++ chrome/browser/shell_integration_linux.cc Sat Jul 7 15:58:16 2012
@@ -122,6 +122,8 @@ bool CreateShortcutOnDesktop(const FilePath& shortcut_
if (!PathService::Get(chrome::DIR_USER_DESKTOP, &desktop_path))
return false;
+#if !defined(OS_OPENBSD)
+// BSD: Linux-specific calls like openat are used so defined out for BSD.
int desktop_fd = open(desktop_path.value().c_str(), O_RDONLY | O_DIRECTORY);
if (desktop_fd < 0)
return false;
@@ -150,6 +152,7 @@ bool CreateShortcutOnDesktop(const FilePath& shortcut_
if (HANDLE_EINTR(close(desktop_fd)) < 0)
PLOG(ERROR) << "close";
+#endif
return true;
}