From owner-freebsd-ports-bugs@FreeBSD.ORG Wed Dec 16 04:40:06 2009 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D5D951065694 for ; Wed, 16 Dec 2009 04:40:06 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id B1C9C8FC15 for ; Wed, 16 Dec 2009 04:40:06 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.3/8.14.3) with ESMTP id nBG4e6o5096810 for ; Wed, 16 Dec 2009 04:40:06 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.3/8.14.3/Submit) id nBG4e6ex096809; Wed, 16 Dec 2009 04:40:06 GMT (envelope-from gnats) Resent-Date: Wed, 16 Dec 2009 04:40:06 GMT Resent-Message-Id: <200912160440.nBG4e6ex096809@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, "Dima Panov" Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id CE911106566B for ; Wed, 16 Dec 2009 04:36:49 +0000 (UTC) (envelope-from fluffy@FreeBSD.org) Received: from ns.ael.RU (ns.ael.ru [62.76.207.226]) by mx1.freebsd.org (Postfix) with ESMTP id 2B9368FC08 for ; Wed, 16 Dec 2009 04:36:48 +0000 (UTC) Received: from Fluffy.Khv.RU (dhcp-14.local.ael [192.168.100.14]) by ns.ael.RU (8.14.3/8.14.3/Fluffy/5.3) with ESMTP id nBG4akR4004105 for ; Wed, 16 Dec 2009 14:36:46 +1000 (VLAT) (envelope-from fluffy@FreeBSD.org) Received: from Fluffy.Khv.RU (localhost [127.0.0.1]) by Fluffy.Khv.RU (8.14.3/8.14.3/Fluffy/5.4.1) with ESMTP id nBG4akM8081721 for ; Wed, 16 Dec 2009 14:36:46 +1000 (VLAT) (envelope-from fluffy@FreeBSD.org) Message-Id: <1260938206.81675@Fluffy.Khv.RU> Date: Wed, 16 Dec 2009 14:36:46 +1000 From: "Dima Panov" To: "FreeBSD gnats submit" X-Send-Pr-Version: gtk-send-pr 0.4.9 Cc: Subject: ports/141668: security/keepassx: unbreak with qt>=4.4.0 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 16 Dec 2009 04:40:06 -0000 >Number: 141668 >Category: ports >Synopsis: security/keepassx: unbreak with qt>=4.4.0 >Confidential: no >Severity: serious >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Wed Dec 16 04:40:06 UTC 2009 >Closed-Date: >Last-Modified: >Originator: Dima Panov >Release: FreeBSD 9.0-900004-CURRENT amd64 >Organization: Fluffy.Khv.RU >Environment: System: FreeBSD 9.0-900004-CURRENT #0: Mon Dec 7 14:03:42 VLAT 2009 fluffy@Fluffy.Khv.RU:/usr/obj/usr/src/sys/Spot >Description: security/keepassx: unbreak with qt>=4.4.0 patch backported from keepassx svn repository >How-To-Repeat: >Fix: --- keepassx.diff begins here --- diff -urN security/keepassx.orig/files/patch-from-trunk security/keepassx/files/patch-from-trunk --- security/keepassx.orig/files/patch-from-trunk 1970-01-01 10:00:00.000000000 +1000 +++ security/keepassx/files/patch-from-trunk 2009-12-15 22:08:43.000000000 +1000 @@ -0,0 +1,77 @@ +diff -urN --exclude=.svn ./CMakeLists.txt ./CMakeLists.txt +--- ./CMakeLists.txt 2009-03-20 06:54:20.000000000 +1000 ++++ ./CMakeLists.txt 2009-12-15 20:50:23.915416903 +1000 +@@ -70,8 +70,8 @@ + find_package(X11) + + IF( X11_XTest_FOUND ) +- INCLUDE_DIRECTORIES( ${X11_XTest_INCLUDE_PATH} ) +- SET(AUTOTYPE_LIBRARIES ${X11_XTest_LIB}) ++ INCLUDE_DIRECTORIES( ${X11_X11_INCLUDE_PATH} ${X11_XTest_INCLUDE_PATH} ) ++ SET(AUTOTYPE_LIBRARIES ${X11_X11_LIB} ${X11_XTest_LIB}) + ADD_DEFINITIONS(-DAUTOTYPE -DGLOBAL_AUTOTYPE) + ELSE( X11_XTest_FOUND ) + SET(AUTOTYPE FALSE) +diff -urN --exclude=.svn ./src/Database.h ./src/Database.h +--- ./src/Database.h 2009-03-18 22:09:20.000000000 +1000 ++++ ./src/Database.h 2009-12-15 20:50:22.627407114 +1000 +@@ -233,7 +233,7 @@ + /*! + This is the common base interface for databases. Every database class must implement this interface necessarily. + */ +-class IDatabase:public QObject{ ++class IDatabase{ + public: + virtual ~IDatabase(){}; + +diff -urN --exclude=.svn ./src/Kdb3Database.cpp ./src/Kdb3Database.cpp +--- ./src/Kdb3Database.cpp 2009-08-29 03:22:44.000000000 +1100 ++++ ./src/Kdb3Database.cpp 2009-12-15 20:50:22.627407114 +1000 +@@ -609,6 +609,7 @@ + + if ((crypto_size > 2147483446) || (!crypto_size && NumGroups)){ + error=tr("Decryption failed.\nThe key is wrong or the file is damaged."); ++ KeyError=true; + LOAD_RETURN_CLEANUP + } + SHA256::hashBuffer(buffer+DB_HEADER_SIZE,FinalKey,crypto_size); +diff -urN --exclude=.svn ./src/lib/FileDialogs.cpp ./src/lib/FileDialogs.cpp +--- ./src/lib/FileDialogs.cpp 2008-03-13 06:37:54.000000000 +1000 ++++ ./src/lib/FileDialogs.cpp 2009-12-15 20:50:19.906387263 +1000 +@@ -18,6 +18,9 @@ + ***************************************************************************/ + + #include ++#if QT_VERSION >= 0x040400 ++ #include ++#endif + + IFileDialog* KpxFileDialogs::iFileDialog=NULL; + QtStandardFileDialogs DefaultQtDlgs; +@@ -146,8 +149,13 @@ + + QString FileDlgHistory::getDir(const QString& name){ + Entry e=History.value(name); +- if(e.isNull()) ++ if(e.isNull()) { ++#if QT_VERSION >= 0x040400 ++ return QDesktopServices::storageLocation(QDesktopServices::DocumentsLocation); ++#else + return QDir::homePath(); ++#endif ++ } + else + return e.Dir; + } +diff -urN --exclude=.svn ./src/src.pro ./src/src.pro +--- ./src/src.pro 2009-09-14 01:54:12.000000000 +1100 ++++ ./src/src.pro 2009-12-15 20:50:22.624407012 +1000 +@@ -63,7 +63,7 @@ + INSTALLS += shareapp shararemime sharemimelnk sharepixmaps + + contains(DEFINES,AUTOTYPE){ +- LIBS += -lXtst ++ LIBS += -lX11 -lXtst + SOURCES += lib/HelperX11.cpp lib/AutoTypeX11.cpp + HEADERS += lib/HelperX11.h lib/AutoTypeX11.h + } --- keepassx.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted: