diff options
author | drochner <drochner> | 2010-08-11 13:28:08 +0000 |
---|---|---|
committer | drochner <drochner> | 2010-08-11 13:28:08 +0000 |
commit | 1d05639675785a71d35599e818f5260dbe52c491 (patch) | |
tree | dd9230d308e131e3726d55b24982711e33f62df1 /security | |
parent | 502979e0669e8b6d49a9b2ab36f152d27da67258 (diff) | |
download | pkgsrc-1d05639675785a71d35599e818f5260dbe52c491.tar.gz |
update to 0.8.0
changes:
-Beautified the qt4 pinentry
-Minor enhancements
Thanks to Sverre Froyen for testing the qt4 version and finding
a patch which makes the dialog stay on top.
Diffstat (limited to 'security')
-rw-r--r-- | security/pinentry/Makefile | 5 | ||||
-rw-r--r-- | security/pinentry/distinfo | 12 | ||||
-rw-r--r-- | security/pinentry/patches/patch-ab | 68 | ||||
-rw-r--r-- | security/pinentry/patches/patch-ac | 106 | ||||
-rw-r--r-- | security/pinentry/patches/patch-ad | 13 | ||||
-rw-r--r-- | security/pinentry/patches/patch-ae | 13 |
6 files changed, 34 insertions, 183 deletions
diff --git a/security/pinentry/Makefile b/security/pinentry/Makefile index 56a3b68b099..018489cc684 100644 --- a/security/pinentry/Makefile +++ b/security/pinentry/Makefile @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.25 2010/02/22 17:19:09 drochner Exp $ +# $NetBSD: Makefile,v 1.26 2010/08/11 13:28:08 drochner Exp $ # -DISTNAME= pinentry-0.7.6 -PKGREVISION= 1 +DISTNAME= pinentry-0.8.0 CATEGORIES= security MASTER_SITES= ftp://ftp.gnupg.org/gcrypt/pinentry/ diff --git a/security/pinentry/distinfo b/security/pinentry/distinfo index 7569f6004a7..242eee270b9 100644 --- a/security/pinentry/distinfo +++ b/security/pinentry/distinfo @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.7 2010/02/25 11:30:03 drochner Exp $ +$NetBSD: distinfo,v 1.8 2010/08/11 13:28:08 drochner Exp $ -SHA1 (pinentry-0.7.6.tar.gz) = 0c525ce81e5589bc9a4f2eb72705bed2b3e9a8b9 -RMD160 (pinentry-0.7.6.tar.gz) = 6e69eee88b5cbb919ced79971cd4794f5e659023 -Size (pinentry-0.7.6.tar.gz) = 475101 bytes +SHA1 (pinentry-0.8.0.tar.gz) = 381f9ee47b9f198e1be5d3ec4e043067a7e97912 +RMD160 (pinentry-0.8.0.tar.gz) = 966e830fb86c1820057979f581ca71f82a4fc9e0 +Size (pinentry-0.8.0.tar.gz) = 487629 bytes SHA1 (patch-aa) = cd30ad4f3a3737687dc5786ebd861ef3b17c600e -SHA1 (patch-ab) = 2b38195696dc841c5ae9c895e324d27c887d672a -SHA1 (patch-ac) = 1974e3ea91c187544a2c240547fe76e0b3a5da60 +SHA1 (patch-ad) = 3e0cbe86d0b6c192e9598ec486adc48783fbc9cb +SHA1 (patch-ae) = 0a8fb600b4f8c28c7e6f0eae69a0eacfce38f4c9 diff --git a/security/pinentry/patches/patch-ab b/security/pinentry/patches/patch-ab deleted file mode 100644 index 9d904e9f96f..00000000000 --- a/security/pinentry/patches/patch-ab +++ /dev/null @@ -1,68 +0,0 @@ -$NetBSD: patch-ab,v 1.1 2010/02/25 11:30:03 drochner Exp $ - ---- qt4/pinentrydialog.moc.orig 2009-04-03 08:18:25.000000000 -0600 -+++ qt4/pinentrydialog.moc 2010-02-24 13:54:20.000000000 -0700 -@@ -1,8 +1,8 @@ - /**************************************************************************** - ** Meta object code from reading C++ file 'pinentrydialog.h' - ** --** Created: Mon Mar 16 13:03:03 2009 --** by: The Qt Meta Object Compiler version 59 (Qt 4.4.1) -+** Created: Wed Feb 24 13:54:20 2010 -+** by: The Qt Meta Object Compiler version 62 (Qt 4.6.2) - ** - ** WARNING! All changes made in this file will be lost! - *****************************************************************************/ -@@ -10,8 +10,8 @@ - #include "pinentrydialog.h" - #if !defined(Q_MOC_OUTPUT_REVISION) - #error "The header file 'pinentrydialog.h' doesn't include <QObject>." --#elif Q_MOC_OUTPUT_REVISION != 59 --#error "This file was generated using the moc from 4.4.1. It" -+#elif Q_MOC_OUTPUT_REVISION != 62 -+#error "This file was generated using the moc from 4.6.2. It" - #error "cannot be used with the include files from this version of Qt." - #error "(The moc has changed too much.)" - #endif -@@ -20,12 +20,15 @@ QT_BEGIN_MOC_NAMESPACE - static const uint qt_meta_data_PinEntryDialog[] = { - - // content: -- 1, // revision -+ 4, // revision - 0, // classname - 0, 0, // classinfo -- 3, 10, // methods -- 4, 25, // properties -+ 3, 14, // methods -+ 4, 29, // properties - 0, 0, // enums/sets -+ 0, 0, // constructors -+ 0, // flags -+ 2, // signalCount - - // signals: signature, parameters, type, tag, flags - 16, 15, 15, 15, 0x05, -@@ -55,9 +58,13 @@ const QMetaObject PinEntryDialog::static - qt_meta_data_PinEntryDialog, 0 } - }; - -+#ifdef Q_NO_DATA_RELOCATION -+const QMetaObject &PinEntryDialog::getStaticMetaObject() { return staticMetaObject; } -+#endif //Q_NO_DATA_RELOCATION -+ - const QMetaObject *PinEntryDialog::metaObject() const - { -- return &staticMetaObject; -+ return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; - } - - void *PinEntryDialog::qt_metacast(const char *_clname) -@@ -78,6 +85,7 @@ int PinEntryDialog::qt_metacall(QMetaObj - case 0: accepted(); break; - case 1: rejected(); break; - case 2: updateQuality((*reinterpret_cast< const secqstring(*)>(_a[1]))); break; -+ default: ; - } - _id -= 3; - } diff --git a/security/pinentry/patches/patch-ac b/security/pinentry/patches/patch-ac deleted file mode 100644 index 7a552b2d365..00000000000 --- a/security/pinentry/patches/patch-ac +++ /dev/null @@ -1,106 +0,0 @@ -$NetBSD: patch-ac,v 1.1 2010/02/25 11:30:03 drochner Exp $ - ---- qt4/qsecurelineedit.moc.orig 2009-04-03 08:18:25.000000000 -0600 -+++ qt4/qsecurelineedit.moc 2010-02-24 13:54:48.000000000 -0700 -@@ -1,8 +1,8 @@ - /**************************************************************************** - ** Meta object code from reading C++ file 'qsecurelineedit.h' - ** --** Created: Mon Mar 16 13:03:26 2009 --** by: The Qt Meta Object Compiler version 59 (Qt 4.4.1) -+** Created: Wed Feb 24 13:54:48 2010 -+** by: The Qt Meta Object Compiler version 62 (Qt 4.6.2) - ** - ** WARNING! All changes made in this file will be lost! - *****************************************************************************/ -@@ -10,8 +10,8 @@ - #include "qsecurelineedit.h" - #if !defined(Q_MOC_OUTPUT_REVISION) - #error "The header file 'qsecurelineedit.h' doesn't include <QObject>." --#elif Q_MOC_OUTPUT_REVISION != 59 --#error "This file was generated using the moc from 4.4.1. It" -+#elif Q_MOC_OUTPUT_REVISION != 62 -+#error "This file was generated using the moc from 4.6.2. It" - #error "cannot be used with the include files from this version of Qt." - #error "(The moc has changed too much.)" - #endif -@@ -20,12 +20,15 @@ QT_BEGIN_MOC_NAMESPACE - static const uint qt_meta_data_QSecureLineEdit[] = { - - // content: -- 1, // revision -+ 4, // revision - 0, // classname - 0, 0, // classinfo -- 14, 10, // methods -- 16, 80, // properties -- 1, 128, // enums/sets -+ 14, 14, // methods -+ 16, 84, // properties -+ 1, 148, // enums/sets -+ 0, 0, // constructors -+ 0, // flags -+ 6, // signalCount - - // signals: signature, parameters, type, tag, flags - 17, 16, 16, 16, 0x05, -@@ -47,7 +50,7 @@ static const uint qt_meta_data_QSecureLi - - // properties: name, type, flags - 280, 272, 0x0a095103, -- 301, 290, 0x0019510b, -+ 301, 290, 0x0059510b, - 310, 306, 0x02095103, - 325, 320, 0x01095103, - 340, 331, 0x00095009, -@@ -63,8 +66,26 @@ static const uint qt_meta_data_QSecureLi - 473, 320, 0x01095001, - 487, 320, 0x01095001, - -+ // properties: notify_signal_id -+ 0, -+ 0, -+ 0, -+ 0, -+ 0, -+ 0, -+ 0, -+ 0, -+ 0, -+ 0, -+ 0, -+ 0, -+ 0, -+ 0, -+ 0, -+ 0, -+ - // enums: name, flags, count, data -- 331, 0x0, 4, 132, -+ 331, 0x0, 4, 152, - - // enum data: key, value - 503, uint(QSecureLineEdit::Normal), -@@ -98,9 +119,13 @@ const QMetaObject QSecureLineEdit::stati - qt_meta_data_QSecureLineEdit, 0 } - }; - -+#ifdef Q_NO_DATA_RELOCATION -+const QMetaObject &QSecureLineEdit::getStaticMetaObject() { return staticMetaObject; } -+#endif //Q_NO_DATA_RELOCATION -+ - const QMetaObject *QSecureLineEdit::metaObject() const - { -- return &staticMetaObject; -+ return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; - } - - void *QSecureLineEdit::qt_metacast(const char *_clname) -@@ -132,6 +157,7 @@ int QSecureLineEdit::qt_metacall(QMetaOb - case 11: d_func()->_q_clipboardChanged(); break; - case 12: d_func()->_q_handleWindowActivate(); break; - case 13: d_func()->_q_deleteSelected(); break; -+ default: ; - } - _id -= 14; - } diff --git a/security/pinentry/patches/patch-ad b/security/pinentry/patches/patch-ad new file mode 100644 index 00000000000..58c9d1a2211 --- /dev/null +++ b/security/pinentry/patches/patch-ad @@ -0,0 +1,13 @@ +$NetBSD: patch-ad,v 1.1 2010/08/11 13:28:09 drochner Exp $ + +--- qt4/pinentrydialog.cpp.orig 2010-03-03 11:19:55.000000000 +0000 ++++ qt4/pinentrydialog.cpp +@@ -83,7 +83,7 @@ QPixmap icon( QStyle::StandardPixmap whi + + PinEntryDialog::PinEntryDialog( QWidget* parent, const char* name, bool modal, + bool enable_quality_bar ) +- : QDialog( parent ), _grabbed( false ) ++ : QDialog( parent, Qt::WindowStaysOnTopHint ), _grabbed( false ) + { + setWindowFlags( windowFlags() & ~Qt::WindowContextHelpButtonHint ); + diff --git a/security/pinentry/patches/patch-ae b/security/pinentry/patches/patch-ae new file mode 100644 index 00000000000..85ac5cfc80d --- /dev/null +++ b/security/pinentry/patches/patch-ae @@ -0,0 +1,13 @@ +$NetBSD: patch-ae,v 1.1 2010/08/11 13:28:09 drochner Exp $ + +--- qt/pinentrydialog.cpp.orig 2008-12-08 15:16:37.000000000 +0000 ++++ qt/pinentrydialog.cpp +@@ -33,7 +33,7 @@ + + PinEntryDialog::PinEntryDialog( QWidget* parent, const char* name, + bool modal, bool enable_quality_bar ) +- : QDialog( parent, name, modal ), _grabbed( false ) ++ : QDialog( parent, name, modal, Qt::WStyle_StaysOnTop ), _grabbed( false ) + { + QBoxLayout* top = new QVBoxLayout( this, 6 ); + QBoxLayout* upperLayout = new QHBoxLayout( top ); |