[gentoo-commits] proj/qt:master commit in: media-gfx/screenie/files/, media-gfx/screenie/

[gentoo-commits] proj/qt:master commit in: media-gfx/screenie/files/, media-gfx/screenie/

[Michael Palimaka]

commit:     bf0e8e77082c21d8cfbbb8812057af67982f8e7c
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Wed Sep  5 17:29:12 2012 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Wed Sep  5 17:29:12 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=bf0e8e77

[media-gfx/screenie] Backport upstream pull request to fix build wrt bug #431466.

(Portage version: 2.1.11.13/git/Linux x86_64, unsigned Manifest commit)

---
 media-gfx/screenie/files/screenie-9999-build.patch |   32 +++++++++++++++++++
 .../screenie/files/screenie-9999-desktop.patch     |   33 ++++++++++++++++++++
 media-gfx/screenie/screenie-9999.ebuild            |   12 +++++--
 3 files changed, 73 insertions(+), 4 deletions(-)

diff --git a/media-gfx/screenie/files/screenie-9999-build.patch b/media-gfx/screenie/files/screenie-9999-build.patch
new file mode 100644
index 0000000..d1987f1
--- /dev/null
+++ b/media-gfx/screenie/files/screenie-9999-build.patch
@@ -0,0 +1,32 @@
+From b39c4a03503aa1449efaae0c827fd207d8c96992 Mon Sep 17 00:00:00 2001
+From: Michael <kensington@astralcloak.net>
+Date: Thu, 5 Apr 2012 21:58:03 +1000
+Subject: [PATCH 1/2] Avoid collision with minor/major macro definitions in
+ glibc.
+
+---
+ src/Utils/src/Version.cpp | 8 ++++++++
+ 1 file changed, 8 insertions(+)
+
+diff --git a/src/Utils/src/Version.cpp b/src/Utils/src/Version.cpp
+index a41116b..5f4c2a6 100644
+--- a/src/Utils/src/Version.cpp
++++ b/src/Utils/src/Version.cpp
+@@ -22,6 +22,14 @@
+ #include <QtCore/QRegExp>
+ #include "Version.h"
+ 
++#ifdef minor
++#undef minor
++#endif
++
++#ifdef major
++#undef major
++#endif
++
+ class VersionPrivate
+ {
+ public:
+-- 
+1.7.12
+

diff --git a/media-gfx/screenie/files/screenie-9999-desktop.patch b/media-gfx/screenie/files/screenie-9999-desktop.patch
new file mode 100644
index 0000000..7bb70b7
--- /dev/null
+++ b/media-gfx/screenie/files/screenie-9999-desktop.patch
@@ -0,0 +1,33 @@
+From 5320cf9b5c764d621b7135a13d84d1cd9f63e2df Mon Sep 17 00:00:00 2001
+From: Michael <kensington@astralcloak.net>
+Date: Thu, 5 Apr 2012 22:05:37 +1000
+Subject: [PATCH 2/2] Fix screenie.desktop to pass validation.
+
+---
+ src/Screenie/res/screenie.desktop | 7 +++----
+ 1 file changed, 3 insertions(+), 4 deletions(-)
+
+diff --git a/src/Screenie/res/screenie.desktop b/src/Screenie/res/screenie.desktop
+index aa316d3..d2f6988 100644
+--- a/src/Screenie/res/screenie.desktop
++++ b/src/Screenie/res/screenie.desktop
+@@ -1,5 +1,5 @@
+ [Desktop Entry]
+-Version=0.1.0
++Version=1.0
+ Type=Application
+ Name=Screenie
+ GenericName=Screenshot composer
+@@ -8,7 +8,6 @@ Exec=Screenie %U
+ TryExec=Screenie
+ Icon=screenie
+ Terminal=false
+-Categories=Graphics;2DGraphics;RasterGraphics;Qt
++Categories=Graphics;2DGraphics;RasterGraphics;Qt;
+ StartupNotify=true
+-MimeType=application/x-xsc
+-
++MimeType=application/x-xsc;
+-- 
+1.7.12
+

diff --git a/media-gfx/screenie/screenie-9999.ebuild b/media-gfx/screenie/screenie-9999.ebuild
index e13b891..d13e312 100644
--- a/media-gfx/screenie/screenie-9999.ebuild
+++ b/media-gfx/screenie/screenie-9999.ebuild
@@ -4,12 +4,11 @@
 
 EAPI=4
 
-inherit qt4-r2 git-2 multilib
-
-EGIT_REPO_URI="git://github.com/ariya/screenie.git"
+inherit qt4-r2 git-2
 
 DESCRIPTION="A small Qt-based tool to allow you to compose fancy and stylish screenshots"
 HOMEPAGE="http://code.google.com/p/screenie"
+EGIT_REPO_URI="git://github.com/ariya/screenie.git"
 
 LICENSE="GPL-2 GPL-3"
 SLOT="0"
@@ -19,6 +18,11 @@ IUSE=""
 DEPEND="x11-libs/qt-gui:4"
 RDEPEND="${DEPEND}"
 
+PATCHES=(
+	"${FILESDIR}/${P}-build.patch"
+	"${FILESDIR}/${P}-desktop.patch"
+)
+
 src_prepare () {
 	qt4-r2_src_prepare
 	sed -i -e "/^Exec/s:Screenie:${PN}:" -e "/^TryExec/s:Screenie:${PN}:" \
@@ -26,7 +30,7 @@ src_prepare () {
 }
 
 src_install() {
-	# The package uses generic library names that make cause collisions
+	# The package uses generic library names that may cause collisions
 	# in the future. They need to be moved to a subfolder
 	dolib.so "${S}"/bin/release/*.so*
 	newbin "${S}"/bin/release/Screenie ${PN}