François Andriot
11 years ago
commit
cc3858bd88
@ -1,2 +1,2 @@
|
||||
10_su-to-root_usage.diff
|
||||
# 10_su-to-root_usage.diff
|
||||
13_add_kuser_issuperuser.diff
|
||||
|
||||
@ -1,4 +1,6 @@
|
||||
#!/bin/sh
|
||||
|
||||
export TDEDIRS=/usr/:/opt/trinity/
|
||||
/opt/trinity/bin/tdecmshell.real $1 $2 $3 $4 $5 $6 $7 $8
|
||||
export XDG_CONFIG_DIRS=/opt/trinity/etc/xdg:/etc/xdg
|
||||
export XDG_DATA_DIRS=/opt/trinity/share:/usr/share
|
||||
|
||||
${0}.real "$@"
|
||||
|
||||
@ -1,2 +1,2 @@
|
||||
10_su-to-root_usage.diff
|
||||
# 10_su-to-root_usage.diff
|
||||
13_add_kuser_issuperuser.diff
|
||||
|
||||
@ -1,4 +1,6 @@
|
||||
#!/bin/sh
|
||||
|
||||
export TDEDIRS=/usr/:/opt/trinity/
|
||||
/opt/trinity/bin/tdecmshell.real $1 $2 $3 $4 $5 $6 $7 $8
|
||||
export XDG_CONFIG_DIRS=/opt/trinity/etc/xdg:/etc/xdg
|
||||
export XDG_DATA_DIRS=/opt/trinity/share:/usr/share
|
||||
|
||||
${0}.real "$@"
|
||||
|
||||
@ -1,2 +1,2 @@
|
||||
10_su-to-root_usage.diff
|
||||
# 10_su-to-root_usage.diff
|
||||
13_add_kuser_issuperuser.diff
|
||||
|
||||
@ -1,4 +1,6 @@
|
||||
#!/bin/sh
|
||||
|
||||
export TDEDIRS=/usr/:/opt/trinity/
|
||||
/opt/trinity/bin/tdecmshell.real $1 $2 $3 $4 $5 $6 $7 $8
|
||||
export XDG_CONFIG_DIRS=/opt/trinity/etc/xdg:/etc/xdg
|
||||
export XDG_DATA_DIRS=/opt/trinity/share:/usr/share
|
||||
|
||||
${0}.real "$@"
|
||||
|
||||
@ -1,29 +0,0 @@
|
||||
--- gtk-qt-engine/kcm_gtk/kcmgtk.cpp.ORI 2013-07-23 23:35:16.614406882 +0200
|
||||
+++ gtk-qt-engine/kcm_gtk/kcmgtk.cpp 2013-07-23 23:56:39.121594541 +0200
|
||||
@@ -261,13 +261,22 @@
|
||||
}
|
||||
}
|
||||
|
||||
+ bool gtk3installed = false;
|
||||
widget->styleBox3->clear();
|
||||
TQStringList otherGtk3Styles = gtk3Themes.keys();
|
||||
- otherGtk3Styles.remove(otherGtk3Styles.find("tdegtk"));
|
||||
- widget->styleBox3->insertStringList(otherGtk3Styles);
|
||||
-
|
||||
- bool gtk3installed = (gtk3Themes.find("tdegtk") != gtk3Themes.end());
|
||||
+ if(!otherGtk3Styles.empty()) {
|
||||
+ otherGtk3Styles.remove(otherGtk3Styles.find("tdegtk"));
|
||||
+ if(!otherGtk3Styles.empty()) {
|
||||
+ gtk3installed = (gtk3Themes.find("tdegtk") != gtk3Themes.end());
|
||||
+ }
|
||||
+ }
|
||||
+ if(gtk3installed) {
|
||||
+ widget->styleBox3->insertStringList(otherGtk3Styles);
|
||||
+ }
|
||||
+ otherGtk3Styles.clear();
|
||||
widget->styleKde3->setEnabled(gtk3installed);
|
||||
+ widget->styleBox3->setEnabled(gtk3installed);
|
||||
+ widget->styleOther3->setEnabled(gtk3installed);
|
||||
widget->warning4->setHidden(gtk3installed);
|
||||
widget->warning5->setHidden(gtk3installed);
|
||||
widget->warning6->setHidden(gtk3installed);
|
||||
@ -1,33 +0,0 @@
|
||||
--- trinity-python-tqt-14.0.0~pre36+d3f27c3e/sip/qt/qobject.sip.ORI 2013-07-03 20:23:06.054830311 +0200
|
||||
+++ trinity-python-tqt-14.0.0~pre36+d3f27c3e/sip/qt/qobject.sip 2013-07-03 20:23:14.833911835 +0200
|
||||
@@ -2196,7 +2196,7 @@
|
||||
// See if it is a TQt signal.
|
||||
if (*sig == '2')
|
||||
{
|
||||
- pyqt3TQtSignal *tab;
|
||||
+ pyqt3QtSignal *tab;
|
||||
|
||||
// Search the table.
|
||||
for (tab = ((pyqt3ClassTypeDef *)((sipWrapperType *)(self->ob_type))->type)->qt3_emit; tab->st_name != NULL; ++tab)
|
||||
--- trinity-python-tqt-14.0.0~pre36+d3f27c3e/configure.py.ORI 2013-07-23 18:00:47.017942165 +0200
|
||||
+++ trinity-python-tqt-14.0.0~pre36+d3f27c3e/configure.py 2013-07-23 18:01:40.757575552 +0200
|
||||
@@ -321,6 +321,9 @@
|
||||
makefile.extra_include_dirs.append(qt_dir + "/src/3rdparty/zlib")
|
||||
makefile.extra_include_dirs.append(os.path.join(src_dir, "pyuic3"))
|
||||
|
||||
+ if not os.access("pyuic3", os.F_OK):
|
||||
+ os.mkdir("pyuic3")
|
||||
+
|
||||
makefile.generate()
|
||||
tool_dirs.append("pyuic3")
|
||||
|
||||
@@ -350,6 +353,9 @@
|
||||
|
||||
makefile.extra_include_dirs.append(os.path.join(src_dir, "pylupdate3"))
|
||||
|
||||
+ if not os.access("pylupdate3", os.F_OK):
|
||||
+ os.mkdir("pylupdate3")
|
||||
+
|
||||
makefile.generate()
|
||||
tool_dirs.append("pylupdate3")
|
||||
elif qt_version >= 0x020000:
|
||||
@ -1,2 +1,2 @@
|
||||
10_su-to-root_usage.diff
|
||||
# 10_su-to-root_usage.diff
|
||||
13_add_kuser_issuperuser.diff
|
||||
|
||||
@ -1,4 +1,6 @@
|
||||
#!/bin/sh
|
||||
|
||||
export TDEDIRS=/usr/:/opt/trinity/
|
||||
/opt/trinity/bin/tdecmshell.real $1 $2 $3 $4 $5 $6 $7 $8
|
||||
export XDG_CONFIG_DIRS=/opt/trinity/etc/xdg:/etc/xdg
|
||||
export XDG_DATA_DIRS=/opt/trinity/share:/usr/share
|
||||
|
||||
${0}.real "$@"
|
||||
|
||||
@ -1,2 +1,2 @@
|
||||
10_su-to-root_usage.diff
|
||||
# 10_su-to-root_usage.diff
|
||||
13_add_kuser_issuperuser.diff
|
||||
|
||||
@ -1,4 +1,6 @@
|
||||
#!/bin/sh
|
||||
|
||||
export TDEDIRS=/usr/:/opt/trinity/
|
||||
/opt/trinity/bin/tdecmshell.real $1 $2 $3 $4 $5 $6 $7 $8
|
||||
export XDG_CONFIG_DIRS=/opt/trinity/etc/xdg:/etc/xdg
|
||||
export XDG_DATA_DIRS=/opt/trinity/share:/usr/share
|
||||
|
||||
${0}.real "$@"
|
||||
|
||||
@ -1,2 +1,2 @@
|
||||
10_su-to-root_usage.diff
|
||||
# 10_su-to-root_usage.diff
|
||||
13_add_kuser_issuperuser.diff
|
||||
|
||||
@ -1,4 +1,6 @@
|
||||
#!/bin/sh
|
||||
|
||||
export TDEDIRS=/usr/:/opt/trinity/
|
||||
/opt/trinity/bin/tdecmshell.real $1 $2 $3 $4 $5 $6 $7 $8
|
||||
export XDG_CONFIG_DIRS=/opt/trinity/etc/xdg:/etc/xdg
|
||||
export XDG_DATA_DIRS=/opt/trinity/share:/usr/share
|
||||
|
||||
${0}.real "$@"
|
||||
|
||||
Loading…
Reference in new issue