diff options
Diffstat (limited to 'freebsd/dependencies/pinentry-tqt')
5 files changed, 100 insertions, 26 deletions
diff --git a/freebsd/dependencies/pinentry-tqt/Makefile b/freebsd/dependencies/pinentry-tqt/Makefile index 0628d3773..895ad413a 100644 --- a/freebsd/dependencies/pinentry-tqt/Makefile +++ b/freebsd/dependencies/pinentry-tqt/Makefile @@ -5,7 +5,7 @@ PORTNAME= pinentry PORTVERSION= 1.2.1 -PORTREVISION?= 0.1 +PORTREVISION?= 0.2 CATEGORIES= security MASTER_SITES= GNUPG/pinentry diff --git a/freebsd/dependencies/pinentry-tqt/files/patch-tqt_pinentrydialog.cpp b/freebsd/dependencies/pinentry-tqt/files/patch-tqt_pinentrydialog.cpp new file mode 100644 index 000000000..ea73c0cfc --- /dev/null +++ b/freebsd/dependencies/pinentry-tqt/files/patch-tqt_pinentrydialog.cpp @@ -0,0 +1,33 @@ +--- tqt/pinentrydialog.cpp.orig ++++ tqt/pinentrydialog.cpp +@@ -84,18 +84,18 @@ + + _ok->setDefault(true); + +- connect( _ok, SIGNAL( clicked() ), +- this, SIGNAL( accepted() ) ); +- connect( _cancel, SIGNAL( clicked() ), +- this, SIGNAL( rejected() ) ); +- connect( _edit, SIGNAL( textModified(const SecTQString&) ), +- this, SLOT( updateQuality(const SecTQString&) ) ); +- connect (_edit, SIGNAL (backspacePressed()), +- this, SLOT (onBackspace ())); +- connect (this, SIGNAL (accepted ()), +- this, SLOT (accept ())); +- connect (this, SIGNAL (rejected ()), +- this, SLOT (reject ())); ++ connect( _ok, TQ_SIGNAL( clicked() ), ++ this, TQ_SIGNAL( accepted() ) ); ++ connect( _cancel, TQ_SIGNAL( clicked() ), ++ this, TQ_SIGNAL( rejected() ) ); ++ connect( _edit, TQ_SIGNAL( textModified(const SecTQString&) ), ++ this, TQ_SLOT( updateQuality(const SecTQString&) ) ); ++ connect (_edit, TQ_SIGNAL (backspacePressed()), ++ this, TQ_SLOT (onBackspace ())); ++ connect (this, TQ_SIGNAL (accepted ()), ++ this, TQ_SLOT (accept ())); ++ connect (this, TQ_SIGNAL (rejected ()), ++ this, TQ_SLOT (reject ())); + _edit->setFocus(); + } + diff --git a/freebsd/dependencies/pinentry-tqt/files/patch-tqt_secqlineedit.cpp b/freebsd/dependencies/pinentry-tqt/files/patch-tqt_secqlineedit.cpp index 4fbca94ab..a95121326 100644 --- a/freebsd/dependencies/pinentry-tqt/files/patch-tqt_secqlineedit.cpp +++ b/freebsd/dependencies/pinentry-tqt/files/patch-tqt_secqlineedit.cpp @@ -1,5 +1,5 @@ ---- tqt/secqlineedit.cpp.orig 2019-03-06 07:09:48 UTC -+++ tqt/secqlineedit.cpp +--- tqt/secqlineedit.cpp.orig 2019-03-06 08:09:48.000000000 +0100 ++++ tqt/secqlineedit.cpp 2024-04-14 19:43:21.398488000 +0200 @@ -86,7 +86,7 @@ #include "ntqaccessible.h" #endif @@ -9,7 +9,7 @@ #include "ntqkeysequence.h" #define ACCEL_KEY(k) "\t" + TQString(TQKeySequence( TQt::CTRL | TQt::Key_ ## k )) #else -@@ -235,7 +235,7 @@ struct SecTQLineEditPrivate : public TQt +@@ -235,7 +235,7 @@ inline bool hasSelectedText() const { return !text.isEmpty() && selend > selstart; } inline void deselect() { selDirty |= (selend > selstart); selstart = selend = 0; } void removeSelectedText(); @@ -18,7 +18,7 @@ void copy( bool clipboard = TRUE ) const; #endif inline bool inSelection( int x ) const -@@ -1018,14 +1018,14 @@ bool SecTQLineEdit::isReadOnly() const +@@ -1018,14 +1018,14 @@ void SecTQLineEdit::setReadOnly( bool enable ) { d->readOnly = enable; @@ -35,7 +35,18 @@ /*! Copies the selected text to the clipboard and deletes it, if there is any, and if echoMode() is \c Normal. -@@ -1081,7 +1081,7 @@ void SecTQLineEditPrivate::copy( bool clipboard ) cons +@@ -1073,15 +1073,15 @@ + #ifndef SECURE + TQString t = q->selectedText(); + if ( !t.isEmpty() && echoMode == SecTQLineEdit::Normal ) { +- q->disconnect( TQApplication::clipboard(), SIGNAL(selectionChanged()), q, 0); ++ q->disconnect( TQApplication::clipboard(), TQ_SIGNAL(selectionChanged()), q, 0); + TQApplication::clipboard()->setText( t, clipboard ? TQClipboard::Clipboard : TQClipboard::Selection ); +- q->connect( TQApplication::clipboard(), SIGNAL(selectionChanged()), +- q, SLOT(clipboardChanged()) ); ++ q->connect( TQApplication::clipboard(), TQ_SIGNAL(selectionChanged()), ++ q, TQ_SLOT(clipboardChanged()) ); + } #endif } @@ -44,7 +55,7 @@ /*!\reimp */ -@@ -1177,7 +1177,7 @@ void SecTQLineEdit::mousePressEvent( TQMouseEvent* e ) +@@ -1177,7 +1177,7 @@ void SecTQLineEdit::mouseMoveEvent( TQMouseEvent * e ) { @@ -53,7 +64,7 @@ if ( ( e->state() & MouseButtonMask ) == 0 ) { if ( !d->readOnly ) setCursor( ( d->inSelection( e->pos().x() ) ? arrowCursor : ibeamCursor ) ); -@@ -1193,7 +1193,7 @@ void SecTQLineEdit::mouseMoveEvent( TQMouseEvent * e ) +@@ -1193,7 +1193,7 @@ */ void SecTQLineEdit::mouseReleaseEvent( TQMouseEvent* e ) { @@ -62,7 +73,7 @@ if (TQApplication::clipboard()->supportsSelection() ) { if ( e->button() == LeftButton ) { d->copy( FALSE ); -@@ -1286,7 +1286,7 @@ void SecTQLineEdit::keyPressEvent( TQKeyEvent * e ) +@@ -1286,7 +1286,7 @@ case Key_B: cursorForward( e->state() & ShiftButton, -1 ); break; @@ -71,7 +82,7 @@ case Key_C: copy(); break; -@@ -1322,7 +1322,7 @@ void SecTQLineEdit::keyPressEvent( TQKeyEvent * e ) +@@ -1322,7 +1322,7 @@ clear(); break; #endif @@ -80,7 +91,7 @@ case Key_V: if ( !d->readOnly ) paste(); -@@ -1431,7 +1431,7 @@ void SecTQLineEdit::keyPressEvent( TQKeyEvent * e ) +@@ -1431,7 +1431,7 @@ if ( !d->readOnly ) undo(); break; @@ -89,7 +100,7 @@ case Key_F16: // Copy key on Sun keyboards copy(); break; -@@ -1720,7 +1720,7 @@ void SecTQLineEdit::clipboardChanged() +@@ -1720,7 +1720,7 @@ void SecTQLineEditPrivate::init( const SecTQString& txt ) { diff --git a/freebsd/dependencies/pinentry-tqt/files/patch-tqt_secqstring.cpp b/freebsd/dependencies/pinentry-tqt/files/patch-tqt_secqstring.cpp index f5ea4924b..bc6a87622 100644 --- a/freebsd/dependencies/pinentry-tqt/files/patch-tqt_secqstring.cpp +++ b/freebsd/dependencies/pinentry-tqt/files/patch-tqt_secqstring.cpp @@ -1,6 +1,6 @@ ---- tqt/secqstring.cpp.orig 2017-12-03 16:32:49 UTC +--- tqt/secqstring.cpp.orig +++ tqt/secqstring.cpp -@@ -80,8 +80,8 @@ static uint computeNewMax( uint len ) +@@ -80,8 +80,8 @@ // IMPORTANT! If you change these, make sure you also change the // "delete unicode" statement in ~SecTQStringData() in SecTQString.h correspondingly! @@ -11,16 +11,28 @@ /***************************************************************************** -@@ -188,7 +188,7 @@ static uint computeNewMax( uint len ) +@@ -188,13 +188,13 @@ \sa TQChar TQCString TQByteArray SecTQConstString */ -Q_EXPORT SecTQStringData *SecTQString::shared_null = 0; +-QT_STATIC_CONST_IMPL SecTQString SecTQString::null; +-QT_STATIC_CONST_IMPL TQChar TQChar::null; +-QT_STATIC_CONST_IMPL TQChar TQChar::replacement((ushort)0xfffd); +-QT_STATIC_CONST_IMPL TQChar TQChar::byteOrderMark((ushort)0xfeff); +-QT_STATIC_CONST_IMPL TQChar TQChar::byteOrderSwapped((ushort)0xfffe); +-QT_STATIC_CONST_IMPL TQChar TQChar::nbsp((ushort)0x00a0); +TQ_EXPORT SecTQStringData *SecTQString::shared_null = 0; - QT_STATIC_CONST_IMPL SecTQString SecTQString::null; - QT_STATIC_CONST_IMPL TQChar TQChar::null; - QT_STATIC_CONST_IMPL TQChar TQChar::replacement((ushort)0xfffd); -@@ -220,7 +220,7 @@ SecTQStringData* SecTQString::makeSharedNull() ++const SecTQString SecTQString::null; ++const TQChar TQChar::null; ++const TQChar TQChar::replacement((ushort)0xfffd); ++const TQChar TQChar::byteOrderMark((ushort)0xfeff); ++const TQChar TQChar::byteOrderSwapped((ushort)0xfffe); ++const TQChar TQChar::nbsp((ushort)0x00a0); + + SecTQStringData* SecTQString::makeSharedNull() + { +@@ -220,7 +220,7 @@ */ SecTQString::SecTQString( TQChar ch ) { @@ -29,7 +41,7 @@ d->unicode[0] = ch; } -@@ -239,7 +239,7 @@ SecTQString::SecTQString( int size, bool /*dummy*/ ) +@@ -239,7 +239,7 @@ { if ( size ) { int l = size; @@ -38,7 +50,7 @@ d = new SecTQStringData( uc, 0, l ); } else { d = shared_null ? shared_null : (shared_null=new SecTQStringData); -@@ -258,7 +258,7 @@ SecTQString::SecTQString( const TQString &str ) +@@ -258,7 +258,7 @@ d = shared_null ? shared_null : makeSharedNull(); d->ref(); } else { @@ -47,7 +59,7 @@ if ( unicode ) memcpy(uc, unicode, length*sizeof(TQChar)); d = new SecTQStringData(uc,unicode ? length : 0,length); -@@ -287,7 +287,7 @@ SecTQString::SecTQString( const TQChar* unicode, uint +@@ -287,7 +287,7 @@ d = shared_null ? shared_null : makeSharedNull(); d->ref(); } else { @@ -56,7 +68,7 @@ if ( unicode ) memcpy(uc, unicode, length*sizeof(TQChar)); d = new SecTQStringData(uc,unicode ? length : 0,length); -@@ -429,7 +429,7 @@ void SecTQString::setLength( uint newLen ) +@@ -429,7 +429,7 @@ ( newLen * 4 < d->maxl && d->maxl > 4 ) ) { // detach, grow or shrink uint newMax = computeNewMax( newLen ); @@ -65,7 +77,16 @@ if ( nd ) { uint len = TQMIN( d->len, newLen ); memcpy( nd, d->unicode, sizeof(TQChar) * len ); -@@ -594,10 +594,10 @@ SecTQString &SecTQString::insert( uint index, const TQ +@@ -548,7 +548,7 @@ + len = slen - index; + if ( index == 0 && len == slen ) + return *this; +- register const TQChar *p = unicode()+index; ++ const TQChar *p = unicode()+index; + SecTQString s( len, TRUE ); + memcpy( s.d->unicode, p, len * sizeof(TQChar) ); + s.d->len = len; +@@ -594,10 +594,10 @@ if ( s >= d->unicode && (uint)(s - d->unicode) < d->maxl ) { // Part of me - take a copy. @@ -78,7 +99,7 @@ return *this; } -@@ -669,10 +669,10 @@ SecTQString &SecTQString::replace( uint index, uint le +@@ -669,10 +669,10 @@ memcpy( d->unicode+index, s, len * sizeof(TQChar) ); } else if ( s >= d->unicode && (uint)(s - d->unicode) < d->maxl ) { // Part of me - take a copy. diff --git a/freebsd/dependencies/pinentry-tqt/files/patch-tqt_secqstring.h b/freebsd/dependencies/pinentry-tqt/files/patch-tqt_secqstring.h index 0dd7973ba..f2b212abd 100644 --- a/freebsd/dependencies/pinentry-tqt/files/patch-tqt_secqstring.h +++ b/freebsd/dependencies/pinentry-tqt/files/patch-tqt_secqstring.h @@ -1,4 +1,4 @@ ---- tqt/secqstring.h.orig 2017-12-03 16:33:12 UTC +--- tqt/secqstring.h.orig +++ tqt/secqstring.h @@ -87,7 +87,7 @@ class SecTQCharRef; template <class T> class TQDeepCopy; @@ -18,6 +18,15 @@ { public: SecTQString(); // make null string +@@ -125,7 +125,7 @@ + + SecTQString &operator=( const SecTQString & ); // impl-shared copy + +- QT_STATIC_CONST SecTQString null; ++ static const SecTQString null; + + bool isNull() const; + bool isEmpty() const; @@ -191,7 +191,7 @@ class Q_EXPORT SecTQString (private) friend class TQDeepCopy<SecTQString>; }; |