diff options
| author |   Robin H. Johnson <robbat2@gentoo.org> | 2015-08-08 13:49:04 -0700 |
|---|---|---|
| committer | Robin H. Johnson <robbat2@gentoo.org> | 2015-08-08 17:38:18 -0700 |
| commit | 56bd759df1d0c750a065b8c845e93d5dfa6b549d (patch) | |
| tree | 3f91093cdb475e565ae857f1c5a7fd339e2d781e /dev-python/pyside/files/qgtkstyle-1.2.2.patch | |
| download | gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.gz gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.bz2 gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.zip | |
proj/gentoo: Initial commit
This commit represents a new era for Gentoo:
Storing the gentoo-x86 tree in Git, as converted from CVS.
This commit is the start of the NEW history.
Any historical data is intended to be grafted onto this point.
Creation process:
1. Take final CVS checkout snapshot
2. Remove ALL ChangeLog* files
3. Transform all Manifests to thin
4. Remove empty Manifests
5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$
5.1. Do not touch files with -kb/-ko keyword flags.
Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests
X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project
X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration
X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn
X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts
X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration
X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging
X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
Diffstat (limited to 'dev-python/pyside/files/qgtkstyle-1.2.2.patch')
| -rw-r--r-- | dev-python/pyside/files/qgtkstyle-1.2.2.patch | 33 |
1 files changed, 33 insertions, 0 deletions
diff --git a/dev-python/pyside/files/qgtkstyle-1.2.2.patch b/dev-python/pyside/files/qgtkstyle-1.2.2.patch new file mode 100644 index 000000000000..d782276aba68 --- /dev/null +++ b/dev-python/pyside/files/qgtkstyle-1.2.2.patch @@ -0,0 +1,33 @@ +diff --git a/PySide/QtGui/CMakeLists.txt b/PySide/QtGui/CMakeLists.txt +index 6e14706..bd60775 100644 +--- a/PySide/QtGui/CMakeLists.txt ++++ b/PySide/QtGui/CMakeLists.txt +@@ -71,7 +71,6 @@ set(QtGui_OPTIONAL_SRC ) + set(QtGui_DROPPED_ENTRIES ) + check_qt_class(QtGui QAbstractPageSetupDialog QtGui_OPTIONAL_SRC QtGui_DROPPED_ENTRIES) + check_qt_class(QtGui QAbstractPrintDialog QtGui_OPTIONAL_SRC QtGui_DROPPED_ENTRIES) +-check_qt_class(QtGui QGtkStyle QtGui_OPTIONAL_SRC QtGui_DROPPED_ENTRIES) + check_qt_class(QtGui QPageSetupDialog QtGui_OPTIONAL_SRC QtGui_DROPPED_ENTRIES) + check_qt_class(QtGui QPrintDialog QtGui_OPTIONAL_SRC QtGui_DROPPED_ENTRIES) + check_qt_class(QtGui QPrintEngine QtGui_OPTIONAL_SRC QtGui_DROPPED_ENTRIES) +diff --git a/PySide/QtGui/typesystem_gui_common.xml b/PySide/QtGui/typesystem_gui_common.xml +index 711d7cc..954aa54 100644 +--- a/PySide/QtGui/typesystem_gui_common.xml ++++ b/PySide/QtGui/typesystem_gui_common.xml +@@ -6996,16 +6996,6 @@ + <modify-function signature="exec()" rename="exec_" allow-thread="yes" /> + </object-type> + +- <object-type name="QGtkStyle"> +- <modify-function signature="standardPixmap(QStyle::StandardPixmap,const QStyleOption*,const QWidget*)const"> +- <modify-argument index="2"> +- <replace-default-expression with="0"/> +- </modify-argument> +- <modify-argument index="3"> +- <replace-default-expression with="0"/> +- </modify-argument> +- </modify-function> +- </object-type> + + <object-type name="QPageSetupDialog"> + <enum-type name="PageSetupDialogOption" flags="PageSetupDialogOptions"/> |