diff options
author | Michele Calgaro <michele.calgaro@yahoo.it> | 2018-07-11 23:38:32 +0900 |
---|---|---|
committer | Michele Calgaro <michele.calgaro@yahoo.it> | 2018-07-11 23:38:32 +0900 |
commit | eeaccbeddbaa2974406eb20cbb7beca3fb4a59f0 (patch) | |
tree | 510e0eea682ebf69263b187287873956394b5e7b /debian/_buildscripts/local/hook_examples/tdelibs | |
parent | 02dbbffa606c3c52833bbaf3dc5c5a050f295dbf (diff) | |
download | tde-packaging-eeaccbeddbaa2974406eb20cbb7beca3fb4a59f0.tar.gz tde-packaging-eeaccbeddbaa2974406eb20cbb7beca3fb4a59f0.zip |
DEB build scripts: several enhancements as follow:
- major rework of update_repositories.sh script, which now supports
multiple branches and provide better feedback to user.
- added support for pre-built extra dependency packages. A user can now
use Slavek Banko's binary packages instead of building the extra
dependency locally. This removes a quite tedious process during the
setup of the building environment.
- bug fixes and more user friendly folder names.
- improved README to cover the complete process until TDE installation.
Special thanks to Gregory Guy <zadig83@laposte.net> for testing and
feedback done so far.
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
Diffstat (limited to 'debian/_buildscripts/local/hook_examples/tdelibs')
-rw-r--r-- | debian/_buildscripts/local/hook_examples/tdelibs/038_placeholder.diff | 64 | ||||
-rwxr-xr-x | debian/_buildscripts/local/hook_examples/tdelibs/pre_build.sh | 13 |
2 files changed, 77 insertions, 0 deletions
diff --git a/debian/_buildscripts/local/hook_examples/tdelibs/038_placeholder.diff b/debian/_buildscripts/local/hook_examples/tdelibs/038_placeholder.diff new file mode 100644 index 000000000..65d64cc72 --- /dev/null +++ b/debian/_buildscripts/local/hook_examples/tdelibs/038_placeholder.diff @@ -0,0 +1,64 @@ +diff -Nur ori/tdelibs/tdeutils/kfinddialog.cpp new/tdelibs/tdeutils/kfinddialog.cpp +--- ori/tdelibs/tdeutils/kfinddialog.cpp 2014-02-05 16:54:13.852605699 +0900 ++++ new/tdelibs/tdeutils/kfinddialog.cpp 2014-02-11 18:16:55.292214876 +0900 +@@ -149,8 +149,9 @@ + m_replace->setMaxCount(10); + m_replace->setDuplicatesEnabled(false); + m_backRef = new TQCheckBox(i18n("Use p&laceholders"), m_replaceGrp); ++ m_backRef->setEnabled(m_regExp->isChecked()); + m_backRefItem = new TQPushButton(i18n("Insert Place&holder"), m_replaceGrp); +- m_backRefItem->setEnabled(false); ++ m_backRefItem->setEnabled(m_regExp->isChecked() && m_backRef->isChecked()); + + m_replaceLayout->addWidget(m_replaceLabel, 0, 0); + m_replaceLayout->addMultiCellWidget(m_replace, 1, 1, 0, 1); +@@ -193,8 +194,8 @@ + + // signals and slots connections + connect(m_selectedText, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotSelectedTextToggled(bool))); +- connect(m_regExp, TQT_SIGNAL(toggled(bool)), m_regExpItem, TQT_SLOT(setEnabled(bool))); +- connect(m_backRef, TQT_SIGNAL(toggled(bool)), m_backRefItem, TQT_SLOT(setEnabled(bool))); ++ connect(m_regExp, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotRegexCheckBoxToggled(bool))); ++ connect(m_backRef, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotPlaceholdersCheckBoxToggled(bool))); + connect(m_regExpItem, TQT_SIGNAL(clicked()), this, TQT_SLOT(showPatterns())); + connect(m_backRefItem, TQT_SIGNAL(clicked()), this, TQT_SLOT(showPlaceholders())); + +@@ -276,11 +277,23 @@ + "Ask before replacing each match found.") ); + } + +-void KFindDialog::textSearchChanged( const TQString & text) ++void KFindDialog::textSearchChanged(const TQString & text) + { + enableButtonOK( !text.isEmpty() ); + } + ++void KFindDialog::slotRegexCheckBoxToggled(bool checked) ++{ ++ m_regExpItem->setEnabled(checked); ++ m_backRef->setEnabled(checked); ++ m_backRefItem->setEnabled(checked && m_backRef->isChecked()); ++} ++ ++void KFindDialog::slotPlaceholdersCheckBoxToggled(bool checked) ++{ ++ m_backRefItem->setEnabled(checked && m_regExp->isChecked()); ++} ++ + void KFindDialog::showEvent( TQShowEvent *e ) + { + if ( !d->m_initialShowDone ) +diff -Nur ori/tdelibs/tdeutils/kfinddialog.h new/tdelibs/tdeutils/kfinddialog.h +--- ori/tdelibs/tdeutils/kfinddialog.h 2014-02-05 16:54:13.852605699 +0900 ++++ new/tdelibs/tdeutils/kfinddialog.h 2014-02-11 18:16:57.876214916 +0900 +@@ -250,7 +250,9 @@ + void slotSelectedTextToggled(bool); + void showPatterns(); + void showPlaceholders(); +- void textSearchChanged( const TQString &); ++ void textSearchChanged(const TQString &); ++ void slotRegexCheckBoxToggled(bool checked); ++ void slotPlaceholdersCheckBoxToggled(bool checked); + + protected: + virtual void showEvent ( TQShowEvent * ); diff --git a/debian/_buildscripts/local/hook_examples/tdelibs/pre_build.sh b/debian/_buildscripts/local/hook_examples/tdelibs/pre_build.sh new file mode 100755 index 000000000..35bfc3c1b --- /dev/null +++ b/debian/_buildscripts/local/hook_examples/tdelibs/pre_build.sh @@ -0,0 +1,13 @@ +#!/bin/bash + +CURR_DIR=$PWD +cd "$PKG_BUILD_PATH" + +# Apply patches +if [ "$bool_COPY_PKG_SRC" = "y" ]; then + echo -e "${CLightPurple}Applying kfinddialog placeholder patch${CNone}" + patch -p2 < "$HOOK_DIR/$PKG_NAME/038_placeholder.diff" +fi + +cd "$CURR_DIR" +return 0 |