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

Handle cups >= 1.6

Browse Source
This commit is contained in:
ajacoutot 2012-08-04 15:07:24 +00:00
parent 000d7e70a2
commit d53ee2856c
2 changed files with 21 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
x11/qt4/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.99 2012/06/14 09:38:35 espie Exp $
# $OpenBSD: Makefile,v 1.100 2012/08/04 15:07:24 ajacoutot Exp $
ONLY_FOR_ARCHS = ${GCC4_ARCHS}
SHARED_ONLY = Yes
@ -24,6 +24,7 @@ PKGNAME-debug = qt4-debug-${PKGVERSION}
FULLPKGNAME-html = qt4-html-${PKGVERSION}
FULLPKGPATH-html = ${BASE_PKGPATH},-html
REVISION-main= 0
SHARED_LIBS = Qt3Support 8.0 \
QtCore 9.0 \
@ -124,10 +125,13 @@ CONFIGURE_ENV = LOCALBASE=${LOCALBASE} QTDIR="${WRKSRC}" \
CONFIGURE_ENV += BOOTSTRAP_MAKE_FLAGS='-j${MAKE_JOBS}'
.endif
BUILD_DEPENDS += print/cups
BUILD_DEPENDS += x11/dbus
BUILD_DEPENDS += databases/postgresql,-server
# configure checks for cups support; no LIB/RUN_DEPENDS because libcups
# is only dlopen()ed if found
BUILD_DEPENDS += print/cups,-libs
MULTI_PACKAGES = -main -examples \
-html -mysql -postgresql -sqlite2 -tds

15
x11/qt4/patches/patch-src_gui_painting_qcups_cpp Normal file
View File

@ -0,0 +1,15 @@
$OpenBSD: patch-src_gui_painting_qcups_cpp,v 1.1 2012/08/04 15:07:25 ajacoutot Exp $
libcups.so.2 -> libcups.so
--- src/gui/painting/qcups.cpp.orig Sun Jul 29 12:16:17 2012
+++ src/gui/painting/qcups.cpp Sun Jul 29 12:16:36 2012
@@ -87,7 +87,7 @@ static CupsPrintFile _cupsPrintFile = 0;
static void resolveCups()
{
- QLibrary cupsLib(QLatin1String("cups"), 2);
+ QLibrary cupsLib(QLatin1String("cups"));
if(cupsLib.load()) {
_cupsGetDests = (CupsGetDests) cupsLib.resolve("cupsGetDests");
_cupsFreeDests = (CupsFreeDests) cupsLib.resolve("cupsFreeDests");