df34b561 | 2014-10-03 16:04:32 | François Andriot |
RPM Packaging: update tqt3 |
||
M redhat/dependencies/tqt3/tqt3-14.0.0.spec R redhat/tdebase/tdebase-14.0.0-default_menu_icon.patch R redhat/tdebase/tdebase-14.0.0-fix_twin_rules_translation.patch R redhat/tdebase/tdebase-14.0.0-kcm_xcursor_applytheme.patch R redhat/tdebase/tdebase-14.0.0-konsole_wordseps.patch R redhat/tdebase/tdebase-14.0.0-mandriva_use_drakclock.patch R redhat/tdebase/tdebase-14.0.0-open_terminal_here.patch R redhat/tdebase/tdebase-14.0.0-suspend_unmount.patch R redhat/tdebase/tdebase-14.0.0-tdehardwarebackend_fix_iocharset.patch R redhat/tdebase/tdebase-14.0.0-vibrate_dialog.patch |
||
diff --git a/redhat/dependencies/tqt3/tqt3-14.0.0.spec b/redhat/dependencies/tqt3/tqt3-14.0.0.spec index ed5b5c5..a30a590 100644 --- a/redhat/dependencies/tqt3/tqt3-14.0.0.spec +++ b/redhat/dependencies/tqt3/tqt3-14.0.0.spec @@ -1500,7 +1500,7 @@ %suse_update_desktop_file tqassistant Documentation %suse_update_desktop_file tqdesigner GUIDesigner %suse_update_desktop_file tqlinguist Translation -%suse_update_desktop_file tqtconfig Settings +%suse_update_desktop_file tqtconfig Utility %endif # Install applications icons @@ -1550,6 +1550,7 @@ tar cvvfz tqt3-examples.tar.gz tqt3-examples/ install -D -m644 "tqt3-examples.tar.gz" "%{?buildroot}%{_docdir}/tqt3-examples/tqt3-examples.tar.gz" + %clean %__rm -rf %{buildroot} diff --git a/redhat/tdebase/tdebase-14.0.0-default_menu_icon.patch b/redhat/tdebase/tdebase-14.0.0-default_menu_icon.patch deleted file mode 100644 index db80523..0000000 --- a/redhat/tdebase/tdebase-14.0.0-default_menu_icon.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- trinity-tdebase-14.0.0~pre737+02bf1e69/starttde.ORI 2013-07-07 20:01:47.656584924 +0200 -+++ trinity-tdebase-14.0.0~pre737+02bf1e69/starttde 2013-07-07 20:04:37.039608089 +0200 -@@ -347,6 +347,17 @@ - fi - fi - -+# Default Start Button icon for TDE -+if [ ! -e "$tdehome/share/config/kickerrc" ]; then -+ if [ -r "%{tde_starticon}" ]; then -+ [ -d "$tdehome/share/config" ] || mkdir -p "$tdehome/share/config" -+ cat <<EOF >"$tdehome/share/config/kickerrc" -+[KMenu] -+CustomIcon=%{tde_starticon} -+EOF -+ fi -+fi -+ - # XCursor mouse theme needs to be applied here to work even for kded or ksmserver. - if test -n "$kcminputrc_mouse_cursortheme" -o -n "$kcminputrc_mouse_cursorsize" ; then - kapplymousetheme "$kcminputrc_mouse_cursortheme" "$kcminputrc_mouse_cursorsize" diff --git a/redhat/tdebase/tdebase-14.0.0-fix_twin_rules_translation.patch b/redhat/tdebase/tdebase-14.0.0-fix_twin_rules_translation.patch deleted file mode 100644 index d34db88..0000000 --- a/redhat/tdebase/tdebase-14.0.0-fix_twin_rules_translation.patch +++ /dev/null @@ -1,34 +0,0 @@ ---- trinity-tdebase/twin/data/update_default_rules.cpp.ORI 2013-07-27 11:49:19.337804333 +0200 -+++ trinity-tdebase/twin/data/update_default_rules.cpp 2013-07-27 19:12:32.144222960 +0200 -@@ -15,12 +15,18 @@ - #include <kdebug.h> - #include <kinstance.h> - #include <kstandarddirs.h> -+#include <tdeaboutdata.h> -+#include <tdecmdlineargs.h> -+#include <tdeglobal.h> - - int main( int argc, char* argv[] ) - { - if( argc != 2 ) - return 1; -- TDEInstance inst( "twin_update_default_rules" ); -+ TDEAboutData about( "twin_update_default_rules", I18N_NOOP("TWin"), 0, 0, TDEAboutData::License_GPL, I18N_NOOP( "(c) 2004 KWin and KControl Authors" ) ); -+ TDECmdLineArgs::init( argc, argv, &about ); -+ TDEInstance inst( &about ); -+ Q_UNUSED( TDEGlobal::locale() ); // jump-start locales to get to translated desriptions - TQString file = locate( "data", TQString( "twin/default_rules/" ) + argv[ 1 ] ); - if( file.isEmpty()) - { -@@ -43,8 +49,10 @@ - dest_cfg.setGroup( TQString::number( pos )); - for( TQMap< TQString, TQString >::ConstIterator it = entries.begin(); - it != entries.end(); -- ++it ) -+ ++it ) { -+ printf("DEBUG: %s\n", it.key().latin1()); - dest_cfg.writeEntry( it.key(), *it ); -+ } - } - dest_cfg.setGroup( "General" ); - dest_cfg.writeEntry( "count", pos ); diff --git a/redhat/tdebase/tdebase-14.0.0-kcm_xcursor_applytheme.patch b/redhat/tdebase/tdebase-14.0.0-kcm_xcursor_applytheme.patch deleted file mode 100644 index b5adadb..0000000 --- a/redhat/tdebase/tdebase-14.0.0-kcm_xcursor_applytheme.patch +++ /dev/null @@ -1,136 +0,0 @@ ---- tdebase/kcontrol/input/xcursor/themepage.cpp.ORI 2013-07-22 19:33:45.153674930 +0200 -+++ tdebase/kcontrol/input/xcursor/themepage.cpp 2013-07-23 15:24:01.664497762 +0200 -@@ -33,6 +33,8 @@ - #include <tdeio/netaccess.h> - #include <ktar.h> - -+#include "../../krdb/krdb.h" -+ - #include <tqlayout.h> - #include <tqdir.h> - #include <tqpixmap.h> -@@ -42,6 +44,7 @@ - #include <tqpainter.h> - #include <tqfileinfo.h> - #include <tqpushbutton.h> -+#include <dcopref.h> - - #include <cstdlib> // for getenv() - -@@ -53,6 +56,10 @@ - #include <X11/Xlib.h> - #include <X11/Xcursor/Xcursor.h> - -+#ifdef HAVE_XFIXES -+# include <X11/extensions/Xfixes.h> -+#endif -+ - // Check for older version - #if !defined(XCURSOR_LIB_MAJOR) && defined(XCURSOR_MAJOR) - # define XCURSOR_LIB_MAJOR XCURSOR_MAJOR -@@ -133,6 +140,65 @@ - { - } - -+bool ThemePage::applyTheme(TQString theme, TQString size) -+{ -+#ifdef HAVE_XCURSOR -+ if (theme.isEmpty()) { -+ return false; -+ } -+ -+ // Apply the TDE cursor theme to ourselves -+ XcursorSetTheme(tqt_xdisplay(), theme.latin1()); -+ -+ // Tell tdelauncher to set the XCURSOR_THEME and XCURSOR_SIZE environment -+ // variables when launching applications. -+ DCOPRef tdelauncher("tdelauncher"); -+ tdelauncher.send("setLaunchEnv", TQCString("XCURSOR_THEME"), TQFile::encodeName(theme)); -+ if( !size.isEmpty()) { -+ tdelauncher.send("setLaunchEnv", TQCString("XCURSOR_SIZE"), size); -+ } -+ -+ // Update the Xcursor X resources -+ runRdb(0); -+ -+ // Apply the TDE cursor size to ourselves -+ if (!size.isEmpty()) { -+ XcursorSetDefaultSize(tqt_xdisplay(), size.toUInt()); -+ } -+ -+ // Reload the standard cursors -+ TQStringList names; -+ -+ // Qt cursors -+ names << "left_ptr" << "up_arrow" << "cross" << "wait" -+ << "left_ptr_watch" << "ibeam" << "size_ver" << "size_hor" -+ << "size_bdiag" << "size_fdiag" << "size_all" << "split_v" -+ << "split_h" << "pointing_hand" << "openhand" -+ << "closedhand" << "forbidden" << "whats_this" << "copy" << "move" << "link"; -+ -+ // X core cursors -+ names << "X_cursor" << "right_ptr" << "hand1" -+ << "hand2" << "watch" << "xterm" -+ << "crosshair" << "left_ptr_watch" << "center_ptr" -+ << "sb_h_double_arrow" << "sb_v_double_arrow" << "fleur" -+ << "top_left_corner" << "top_side" << "top_right_corner" -+ << "right_side" << "bottom_right_corner" << "bottom_side" -+ << "bottom_left_corner" << "left_side" << "question_arrow" -+ << "pirate"; -+ -+ for (int i = 0; i < names.size(); ++i) -+ { -+ const char* name = (*(names.at(i))).ascii(); -+ Cursor handle = XcursorLibraryLoadCursor(tqt_xdisplay(), name); -+ XFixesChangeCursorByName(tqt_xdisplay(), handle, TQFile::encodeName(name)); -+ XFreeCursor(tqt_xdisplay(), handle); // Don't leak the cursor -+ } -+ -+ return true; -+#else // HAVE_XCURSOR -+ return false; -+#endif -+} - - void ThemePage::save() - { -@@ -145,10 +209,17 @@ - c.setGroup( "Mouse" ); - c.writeEntry( "cursorTheme", selectedTheme != "system" ? selectedTheme : TQString::null ); - -- KMessageBox::information( this, i18n("You have to restart TDE for these " -+ // The Kcontrol panel does not allow to set cursor size for now. -+ // So we keep the same size as written in config file. -+ TQCString size = c.readEntry("cursorSize", TQString()).local8Bit(); -+ -+ if (!applyTheme(selectedTheme, size)) -+ { -+ KMessageBox::information( this, i18n("You have to restart TDE for these " - "changes to take effect."), i18n("Cursor Settings Changed"), - "CursorSettingsChanged" ); -- -+ } -+ - currentTheme = selectedTheme; - } - ---- tdebase/kcontrol/input/xcursor/themepage.h.ORI 2013-07-22 19:49:33.467191658 +0200 -+++ tdebase/kcontrol/input/xcursor/themepage.h 2013-07-22 19:56:03.990484896 +0200 -@@ -45,6 +45,7 @@ - void load(); - void load( bool useDefaults ); - void defaults(); -+ bool applyTheme(TQString theme, TQString size); - - signals: - void changed( bool ); ---- tdebase/kcontrol/input/xcursor/CMakeLists.txt.ORI 2013-07-23 15:24:41.178064068 +0200 -+++ tdebase/kcontrol/input/xcursor/CMakeLists.txt 2013-07-23 15:27:31.694851294 +0200 -@@ -21,5 +21,6 @@ - - tde_add_library( themepage STATIC_PIC AUTOMOC - SOURCES -- themepage.cpp previewwidget.cpp -+ themepage.cpp previewwidget.cpp ../../krdb/krdb.cpp -+ LINK Xfixes - ) diff --git a/redhat/tdebase/tdebase-14.0.0-konsole_wordseps.patch b/redhat/tdebase/tdebase-14.0.0-konsole_wordseps.patch deleted file mode 100644 index a0cb449..0000000 --- a/redhat/tdebase/tdebase-14.0.0-konsole_wordseps.patch +++ /dev/null @@ -1,48 +0,0 @@ -diff -Nuar trinity-tdebase-14.0.0~pre737+02bf1e69.ORI/kcontrol/konsole/kcmkonsole.cpp trinity-tdebase-14.0.0~pre737+02bf1e69/kcontrol/konsole/kcmkonsole.cpp ---- trinity-tdebase-14.0.0~pre737+02bf1e69.ORI/kcontrol/konsole/kcmkonsole.cpp 2013-07-10 07:56:40.070802259 +0200 -+++ trinity-tdebase-14.0.0~pre737+02bf1e69/kcontrol/konsole/kcmkonsole.cpp 2013-07-10 07:58:53.680465150 +0200 -@@ -107,7 +107,7 @@ - dialog->frameCB->setChecked(config.readBoolEntry("has frame",true)); - dialog->line_spacingSB->setValue(config.readUnsignedNumEntry( "LineSpacing", 0 )); - dialog->silence_secondsSB->setValue(config.readUnsignedNumEntry( "SilenceSeconds", 10 )); -- dialog->word_connectorLE->setText(config.readEntry("wordseps",":@-./_~")); -+ dialog->word_connectorLE->setText(config.readEntry("wordseps",":@-./_~+")); - dialog->metaAsAltModeCB->setChecked(config.readBoolEntry("metaAsAltMode",false)); - - dialog->SchemaEditor1->setSchema(config.readEntry("schema")); -diff -Nuar trinity-tdebase-14.0.0~pre737+02bf1e69.ORI/konsole/konsole/konsole.cpp trinity-tdebase-14.0.0~pre737+02bf1e69/konsole/konsole/konsole.cpp ---- trinity-tdebase-14.0.0~pre737+02bf1e69.ORI/konsole/konsole/konsole.cpp 2013-07-10 07:56:40.112802782 +0200 -+++ trinity-tdebase-14.0.0~pre737+02bf1e69/konsole/konsole/konsole.cpp 2013-07-10 07:58:53.698465376 +0200 ** Diff limit reached (max: 250 lines) ** |