diff options
| author |   Caleb Tennis <caleb@gentoo.org> | 2007-12-23 20:27:20 +0000 |
|---|---|---|
| committer | Caleb Tennis <caleb@gentoo.org> | 2007-12-23 20:27:20 +0000 |
| commit | 81bfd6046cdbe10150d294cc7d7df0a9b78e9a64 (patch) | |
| tree | dbbbcd46037bc3e7129ee0b9c95785379976c090 /x11-libs/qt-gui | |
| parent | Introducing desktop menu files in latest version. (diff) | |
| download | historical-81bfd6046cdbe10150d294cc7d7df0a9b78e9a64.tar.gz historical-81bfd6046cdbe10150d294cc7d7df0a9b78e9a64.tar.bz2 historical-81bfd6046cdbe10150d294cc7d7df0a9b78e9a64.zip | |
Add a patch to fix builds with xinerama
Package-Manager: portage-2.1.3.16
Diffstat (limited to 'x11-libs/qt-gui')
| -rw-r--r-- | x11-libs/qt-gui/Manifest | 12 | ||||
| -rw-r--r-- | x11-libs/qt-gui/files/xinerama.patch | 15 | ||||
| -rw-r--r-- | x11-libs/qt-gui/qt-gui-4.4.0_rc1.ebuild | 4 |
3 files changed, 26 insertions, 5 deletions
diff --git a/x11-libs/qt-gui/Manifest b/x11-libs/qt-gui/Manifest index 91b2f89145f5..f8de2c0bb9cc 100644 --- a/x11-libs/qt-gui/Manifest +++ b/x11-libs/qt-gui/Manifest @@ -1,8 +1,12 @@ +AUX xinerama.patch 693 RMD160 c5bdfb4184c4b94059b8c095545355a0b5c48643 SHA1 6848994884a62a0d599e0cb499e546688bfba062 SHA256 ca1afcdd29fe2a1c02af3dbe4640fd4ec2aafa4f0bae4c01e0b6a40e23303a0b +MD5 25bf5d0833a404ca85ba26e60748ffd6 files/xinerama.patch 693 +RMD160 c5bdfb4184c4b94059b8c095545355a0b5c48643 files/xinerama.patch 693 +SHA256 ca1afcdd29fe2a1c02af3dbe4640fd4ec2aafa4f0bae4c01e0b6a40e23303a0b files/xinerama.patch 693 DIST qt-x11-preview-opensource-src-4.4.0-tp1.tar.gz 56029137 RMD160 dd2dee9afaa9d16bdf5ca2bed82a3b9e2162bdd2 SHA1 e242dc542eb1424a51c47e7c80aaefd26668451c SHA256 1757416bda52c34ade3a49b5896bafe9e3cfe092d3180da32d520f94324c0b88 -EBUILD qt-gui-4.4.0_rc1.ebuild 4681 RMD160 64fab869f2cb22c3075bd5f57b12f7af9eac56bb SHA1 bf5e814f745713dbe4d1606699cf89c8c05fd32b SHA256 41b8acf68b778936c163344768bb97998a7d5ff25be01a682feb3ee95b5c286a -MD5 99b9cdf81038b157405639d2eefeb9d1 qt-gui-4.4.0_rc1.ebuild 4681 -RMD160 64fab869f2cb22c3075bd5f57b12f7af9eac56bb qt-gui-4.4.0_rc1.ebuild 4681 -SHA256 41b8acf68b778936c163344768bb97998a7d5ff25be01a682feb3ee95b5c286a qt-gui-4.4.0_rc1.ebuild 4681 +EBUILD qt-gui-4.4.0_rc1.ebuild 4719 RMD160 1c4754ae23adf9e4541014ecca13a84ae098eb63 SHA1 24e6a45d98b5c4977bac6e17dea1eac82b75d47f SHA256 dd4e5558957bf4af2687b6d32ee0d2ad955c332339c7b7af5f38d691510ac9c7 +MD5 b7db624b8207a04f8d119036c3ce9bf5 qt-gui-4.4.0_rc1.ebuild 4719 +RMD160 1c4754ae23adf9e4541014ecca13a84ae098eb63 qt-gui-4.4.0_rc1.ebuild 4719 +SHA256 dd4e5558957bf4af2687b6d32ee0d2ad955c332339c7b7af5f38d691510ac9c7 qt-gui-4.4.0_rc1.ebuild 4719 MISC ChangeLog 343 RMD160 6a1cdd3e8fc80fa52980aa95394b7f1eeca8224b SHA1 cb060d07f3652dd757aea6044d123b6ed4a5c5d2 SHA256 1816de0bf581278e4ca7e282464c071ce24f3831f58900fb09cbe7f17f7add3b MD5 587accbce0c27bef0d24fcde93b8e482 ChangeLog 343 RMD160 6a1cdd3e8fc80fa52980aa95394b7f1eeca8224b ChangeLog 343 diff --git a/x11-libs/qt-gui/files/xinerama.patch b/x11-libs/qt-gui/files/xinerama.patch new file mode 100644 index 000000000000..5edd03395e61 --- /dev/null +++ b/x11-libs/qt-gui/files/xinerama.patch @@ -0,0 +1,15 @@ +--- src/gui/kernel/qapplication_x11.cpp.orig 2007-12-23 15:10:43.000000000 -0500 ++++ src/gui/kernel/qapplication_x11.cpp 2007-12-23 15:11:01.000000000 -0500 +@@ -1715,9 +1715,9 @@ + (PtrXineramaQueryScreens) xineramaLib.resolve("XineramaQueryScreens"); + } + #else +- ptrXineramaQueryScreens = XineramaQueryScreens; +- ptrXineramaIsActive = XineramaIsActive; +- ptrXineramaQueryExtension = XineramaQueryExtension; ++ X11->ptrXineramaQueryScreens = XineramaQueryScreens; ++ X11->ptrXineramaIsActive = XineramaIsActive; ++ X11->ptrXineramaQueryExtension = XineramaQueryExtension; + #endif // QT_RUNTIME_XINERAMA + #endif // QT_NO_XINERAMA + diff --git a/x11-libs/qt-gui/qt-gui-4.4.0_rc1.ebuild b/x11-libs/qt-gui/qt-gui-4.4.0_rc1.ebuild index 4beb6aa1a4af..b3e738e1f95d 100644 --- a/x11-libs/qt-gui/qt-gui-4.4.0_rc1.ebuild +++ b/x11-libs/qt-gui/qt-gui-4.4.0_rc1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-gui/qt-gui-4.4.0_rc1.ebuild,v 1.4 2007/12/22 17:34:16 caleb Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-gui/qt-gui-4.4.0_rc1.ebuild,v 1.5 2007/12/23 20:27:20 caleb Exp $ inherit eutils qt4-build @@ -54,6 +54,8 @@ QT4_TARGET_DIRECTORIES="src/gui tools/assistant tools/designer tools/linguist" src_unpack() { qt4-build_src_unpack + epatch "${FILESDIR}"/xinerama.patch + skip_qmake_build_patch skip_project_generation_patch install_binaries_to_buildtree |