diff options
| author |   Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org> | 2008-03-18 21:54:36 +0000 |
|---|---|---|
| committer | Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org> | 2008-03-18 21:54:36 +0000 |
| commit | 05bd71d773e16d71c45003ab2dccc8de61b3ee8a (patch) | |
| tree | cf7087b3169f8cd556760ba198a35c559e0fa1bc /net-voip | |
| parent | telepathy-haze is in portage (diff) | |
| download | voip-05bd71d773e16d71c45003ab2dccc8de61b3ee8a.tar.gz voip-05bd71d773e16d71c45003ab2dccc8de61b3ee8a.tar.bz2 voip-05bd71d773e16d71c45003ab2dccc8de61b3ee8a.zip | |
wengophone: fix qt-4.3 patch
svn path=/trunk/; revision=667
Diffstat (limited to 'net-voip')
| -rw-r--r-- | net-voip/wengophone/ChangeLog | 6 | ||||
| -rw-r--r-- | net-voip/wengophone/Manifest | 4 | ||||
| -rw-r--r-- | net-voip/wengophone/files/wengophone-2.1-qt-4.3.diff | 49 |
3 files changed, 33 insertions, 26 deletions
diff --git a/net-voip/wengophone/ChangeLog b/net-voip/wengophone/ChangeLog index 2324053..5e58589 100644 --- a/net-voip/wengophone/ChangeLog +++ b/net-voip/wengophone/ChangeLog @@ -1,7 +1,11 @@ # ChangeLog for net-im/wengophone -# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 +# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 # $Header: /var/cvsroot/gentoo-x86/skel.ChangeLog,v 1.2 2006/02/22 02:08:04 hd_brummy Exp $ + 18 Mar 2008; Chi-Thanh Christopher Nguyen <chithanh@cs.tu-berlin.de> + files/wengophone-2.1-qt-4.3.diff: + fix CR/LF in qt-4.3 patch + 16 Dec 2007; Chi-Thanh Christopher Nguyen <chithanh@cs.tu-berlin.de> +files/wengophone-2.1-qt-4.3.diff, -wengophone-2.1.1.ebuild, -wengophone-2.1.2.ebuild, -wengophone-2.1.2-r1.ebuild, diff --git a/net-voip/wengophone/Manifest b/net-voip/wengophone/Manifest index a876732..88d418a 100644 --- a/net-voip/wengophone/Manifest +++ b/net-voip/wengophone/Manifest @@ -1,11 +1,11 @@ AUX alsa-plughw-default.patch 2214 RMD160 daacb3f4f45bd9146bf31585c960f60607e8a3fd SHA1 969a9d3caafb330247f11363bd6e37701616ab98 SHA256 139d31dea26637da8137336cced9586cd25e4f975a25b7831609c022bda62df6 AUX phapi_newerffmpeg.diff 7081 RMD160 21ce47c355be6506ebb0f8ae6bdfa294dc7f9ab9 SHA1 aa699703e70425112d8e071032a16970f37ff860 SHA256 4ae8958c1b1d59746c5a5e2ad3e5cbdc4a5062f74590bcb80aa87d26bc3cf312 AUX pixertool_newerffmpeg.diff 9432 RMD160 54f9c9fd1010bb55a6210b6ce05c8b73e905463b SHA1 08d0a1a8d38da6aa87c1e4a27841dd2b54c3b48e SHA256 d54bb22a3afbd6a49092a1e804bc6effe7d8419e0cba37a05e183df792f5f5e1 -AUX wengophone-2.1-qt-4.3.diff 830 RMD160 5c703fa6d3d8fe4d47335018c29fac734dfc334a SHA1 f8e05f4552c4d851d4168673a52c2e7e2e0fa75f SHA256 f2a3926f3334b3acb4020263de4a4272d7185209954879e1ae60c22aa0ed3f51 +AUX wengophone-2.1-qt-4.3.diff 747 RMD160 06236510f666dfdc2a77040b0a295ea0543eceee SHA1 bede5b4c2816b178cdd4cdb25e546fa282bbae53 SHA256 77b2e5ec794cd213a1e6d754d5fb16180a019d0fdf7f25a825b063581ec23d1c AUX wengophone_externavcodec.diff 438 RMD160 cbd241bad583e63501a0647512cd0ecc99dcb6b8 SHA1 72f276cd5b3a7a98a46c596f15aa4a8fa271b6e1 SHA256 d66bd4e04e63d7a405e75f3bddba33521a77b6da39bda2ba2f06e3207e56e9f5 DIST wengophone-2.1.1-v4l2-patches.tar.bz2 7889 RMD160 cd233c35be0a5a8168aee1f30d574235e049a450 SHA1 4feac585e56e7976361e55abd05163873c3109ca SHA256 18763293a8d3c36805eaa34a8fd28645929967164aed090c453230011d91f0d3 DIST wengophone-2.1.2-source.zip 48210044 RMD160 f9b2a106dcd27c228cca3305bead2c9738ac39c6 SHA1 53839c87efe322879fd416e0111ed70348587116 SHA256 ac9d254f8c4b0146fa4751f2328aab1765a0d27709e883eb46a9f297e155681e DIST wengophone-2.1.99.2-source.zip 48287963 RMD160 a5cdd1c58474b43eb1054e7554a412bafe9aa76c SHA1 5faaf5e2e03b0d2bd21aa00c8a3db34f25617c73 SHA256 f328465a2b15bd627463a17c8e689d70bc1f07a17e2e28b892f643ffdef45b24 EBUILD wengophone-2.1.2-r2.ebuild 2792 RMD160 6b90cee3aa7d4f408db7c77603d921d626f49ca0 SHA1 4691787eee8980b185be6b75f8ed79569323f7ba SHA256 e32a8bf8dabbba470ef2b4049c1fa32cb9ad8f28d97504eb64b2bab333d0b596 EBUILD wengophone-2.1.99.2.ebuild 2239 RMD160 b41f16995e8ff8dd1012bc75303b1e4a06213839 SHA1 573bf2c64341c55f78feb18db301468ea6f03c80 SHA256 dfbd74d04ec82b5c7e9df9764b5f3d1558361820a21f0d9280ca89802d1f4cd0 -MISC ChangeLog 1313 RMD160 aa4aaef482165a98530c9c053f6d98cd887e2dc3 SHA1 60e61005348c23cf6a910f09fe6abd77b77ec7f4 SHA256 81eeabb5daf027e17542660a229750035b4e279012bc0a24fc68ff7d12175e47 +MISC ChangeLog 1449 RMD160 66248593abb2ac0c266e40a4f7e5c931d0ba8462 SHA1 668e7ebeb4ddc8930d68ae40dcc5e360f146aae2 SHA256 457273fad185cfc441691493aaa926ff926f7afe09f8d187f79d1817b3bdaa14 diff --git a/net-voip/wengophone/files/wengophone-2.1-qt-4.3.diff b/net-voip/wengophone/files/wengophone-2.1-qt-4.3.diff index cfc310c..9bbb6ef 100644 --- a/net-voip/wengophone/files/wengophone-2.1-qt-4.3.diff +++ b/net-voip/wengophone/files/wengophone-2.1-qt-4.3.diff @@ -1,23 +1,26 @@ -Index: /wengophone-ng/branches/wengophone-2.2/wengophone/src/presentation/qt/QtWengoStyle.h
-===================================================================
---- /wengophone-ng/branches/wengophone-2.2/wengophone/src/presentation/qt/QtWengoStyle.h (revision 12904)
-+++ /wengophone-ng/branches/wengophone-2.2/wengophone/src/presentation/qt/QtWengoStyle.h (revision 13153)
-@@ -25,8 +25,8 @@
- #ifdef OS_MACOSX
- #include <QtGui/QMacStyle>
-- class SystemStyle : public QMacStyle { };
-+ typedef QMacStyle BaseStyle;
- #else
-- #include <QtGui/QStyle>
-- class SystemStyle : public QStyle { };
-+ #include <QtGui/QCommonStyle>
-+ typedef QCommonStyle BaseStyle;
- #endif
-
-@@ -40,5 +40,5 @@
- * @author Tanguy Krotoff
- */
--class QtWengoStyle : public SystemStyle {
-+class QtWengoStyle : public BaseStyle {
- public:
-
+diff -ur a/wengophone/src/presentation/qt/QtWengoStyle.h b/wengophone/src/presentation/qt/QtWengoStyle.h +--- a/wengophone/src/presentation/qt/QtWengoStyle.h 2007-02-21 15:13:12.000000000 +0100 ++++ b/wengophone/src/presentation/qt/QtWengoStyle.h 2008-03-18 22:46:26.111284321 +0100 +@@ -24,10 +24,10 @@ + + #ifdef OS_MACOSX + #include <QtGui/QMacStyle> +- class SystemStyle : public QMacStyle { }; ++ typedef QMacStyle BaseStyle; + #else +- #include <QtGui/QStyle> +- class SystemStyle : public QStyle { }; ++ #include <QtGui/QCommonStyle> ++ typedef QCommonStyle BaseStyle; + #endif + + /** +@@ -39,7 +39,7 @@ + * + * @author Tanguy Krotoff + */ +-class QtWengoStyle : public SystemStyle { ++class QtWengoStyle : public BaseStyle { + public: + + QtWengoStyle(); |