diff options
| author |   Agostino Sarubbo <ago@gentoo.org> | 2012-05-10 17:25:06 +0000 |
|---|---|---|
| committer | Agostino Sarubbo <ago@gentoo.org> | 2012-05-10 17:25:06 +0000 |
| commit | d95ce550705be12159a49813afc00af7eb376287 (patch) | |
| tree | 2d81b25226514838966e6bdc1ca320f09cc77778 /app-mobilephone/freesmee | |
| parent | keyword ~amd64-fbsd (diff) | |
| download | gentoo-2-d95ce550705be12159a49813afc00af7eb376287.tar.gz gentoo-2-d95ce550705be12159a49813afc00af7eb376287.tar.bz2 gentoo-2-d95ce550705be12159a49813afc00af7eb376287.zip | |
Fix compile against qt-4.8.1, wrt bug #415409
(Portage version: 2.1.10.49/cvs/Linux x86_64)
Diffstat (limited to 'app-mobilephone/freesmee')
| -rw-r--r-- | app-mobilephone/freesmee/ChangeLog | 8 | ||||
| -rw-r--r-- | app-mobilephone/freesmee/files/freesmee-qt-4.8.1.patch | 12 | ||||
| -rw-r--r-- | app-mobilephone/freesmee/freesmee-0.7-r1.ebuild (renamed from app-mobilephone/freesmee/freesmee-0.7.ebuild) | 3 |
3 files changed, 21 insertions, 2 deletions
diff --git a/app-mobilephone/freesmee/ChangeLog b/app-mobilephone/freesmee/ChangeLog index d01f2a9c08f7..ef56fbbbab2b 100644 --- a/app-mobilephone/freesmee/ChangeLog +++ b/app-mobilephone/freesmee/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for app-mobilephone/jacksms-desktop # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/freesmee/ChangeLog,v 1.3 2012/05/07 17:39:20 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/freesmee/ChangeLog,v 1.4 2012/05/10 17:25:05 ago Exp $ + +*freesmee-0.7-r1 (10 May 2012) + + 10 May 2012; Agostino Sarubbo <ago@gentoo.org> +files/freesmee-qt-4.8.1.patch, + +freesmee-0.7-r1.ebuild, -freesmee-0.7.ebuild: + Fix compile against qt-4.8.1, wrt bug #415409 07 May 2012; Agostino Sarubbo <ago@gentoo.org> metadata.xml: Add myself as co-maintainer with mrfee. Thanks Markos for proxy-maintain it. diff --git a/app-mobilephone/freesmee/files/freesmee-qt-4.8.1.patch b/app-mobilephone/freesmee/files/freesmee-qt-4.8.1.patch new file mode 100644 index 000000000000..a55619d81244 --- /dev/null +++ b/app-mobilephone/freesmee/files/freesmee-qt-4.8.1.patch @@ -0,0 +1,12 @@ +--- libjacksms/DataTypesApi.cpp.old 2012-05-10 19:09:21.114626223 +0200 ++++ libjacksms/DataTypesApi.cpp 2012-05-10 19:10:37.047647425 +0200 +@@ -25,6 +25,9 @@ + #include <QString>
+ #include <QRegExp>
+
++#undef major
++#undef minor
++
+ namespace libJackSMS {
+
+ namespace dataTypesApi {
diff --git a/app-mobilephone/freesmee/freesmee-0.7.ebuild b/app-mobilephone/freesmee/freesmee-0.7-r1.ebuild index 1e027e1eec4d..4db7398c0a82 100644 --- a/app-mobilephone/freesmee/freesmee-0.7.ebuild +++ b/app-mobilephone/freesmee/freesmee-0.7-r1.ebuild @@ -1,6 +1,5 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: EAPI=4 @@ -21,6 +20,8 @@ DEPEND="dev-util/ticpp x11-libs/qt-webkit:4" RDEPEND="${DEPEND}" +PATCHES=( "${FILESDIR}"/${PN}-qt-4.8.1.patch ) + src_install() { newbin Freesmee ${PN} doicon ${PN}.png |