From 95c3dae162ec7065bf67d2178fac899c35b09d4b Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Thu, 23 Mar 2017 22:17:21 +0100
Subject: [PATCH] lyx: use a rdef file, fix deskbar menu icon.

* thanks Humdinger!
---
 app-office/lyx/additional-files/lyx.rdef.in | 28 +++++++++++++++++++++
 app-office/lyx/lyx-2.2.2.recipe             | 24 +++++++++++++++---
 2 files changed, 48 insertions(+), 4 deletions(-)
 create mode 100644 app-office/lyx/additional-files/lyx.rdef.in

diff --git a/app-office/lyx/additional-files/lyx.rdef.in b/app-office/lyx/additional-files/lyx.rdef.in
new file mode 100644
index 000000000..bcdc6babe
--- /dev/null
+++ b/app-office/lyx/additional-files/lyx.rdef.in
@@ -0,0 +1,28 @@
+
+resource app_flags B_SINGLE_LAUNCH | B_ARGV_ONLY;
+
+resource app_version {
+	major = @MAJOR@,
+	middle = @MIDDLE@,
+	minor = @MINOR@,
+	variety = B_APPV_DEVELOPMENT,
+	internal = @INTERNAL@,
+
+	short_info = "Lyx",
+	long_info = "A document processor based on structure rather than appearance."
+};
+
+resource app_signature "application/x-vnd.Lyx";
+
+resource vector_icon {
+	$"6E6369660603007FFF030059B203CB33000399270003FFC00003B28400060A07"
+	$"B868C3D3B4E3BBACB7BABA59B7CABA41BA14BFCBBCD4BE66BE10C1080A07B868"
+	$"C3D3B4E3BBACB7BABA59B7CABA41BA14BFCBBCD4BE66BE10C1080A0CC293B8E6"
+	$"C5B1B96DC667BB6BC7BAB9D7CB23BA7BC829BDF1C9FFC2F4C654C2ADC59FBFF4"
+	$"C405C23EC127C16CC3EEBD520A0CC293B8E6C5B1B96DC667BB6BC7BAB9D7CB23"
+	$"BA7BC829BDF1C9FFC2F4C654C2ADC59FBFF4C405C23EC127C16CC3EEBD520A09"
+	$"BADDBB9BBE68BC15BF76BE49C0CABC61C45CBCD8C116C183C049C5FABCF7C572"
+	$"BD8AC1710A09BADDBB9BBE68BC15BF76BE49C0CABC61C45CBCD8C116C183C049"
+	$"C5FABCF7C572BD8AC171060A000100000A0101011001178000040A020102000A"
+	$"0301031001178000040A040104000A050105100117800004"
+};
diff --git a/app-office/lyx/lyx-2.2.2.recipe b/app-office/lyx/lyx-2.2.2.recipe
index 132fe4493..6a8a6757c 100644
--- a/app-office/lyx/lyx-2.2.2.recipe
+++ b/app-office/lyx/lyx-2.2.2.recipe
@@ -15,10 +15,10 @@ cross-referenced PDF, just as readily produced - looks like nothing else."
 HOMEPAGE="http://www.lyx.org"
 LICENSE="GNU GPL v2"
 COPYRIGHT="the lyx community"
-REVISION="1"
+REVISION="2"
 SOURCE_URI="ftp://ftp.lyx.org/pub/lyx/stable/2.2.x/lyx-$portVersion.tar.gz"
 CHECKSUM_SHA256="7f6a0aeeeb7e9b1405e27394d1b7192e4abebba2491e5d0ffc6a4cb993803a45"
-PATCHES="icon.patch"
+ADDITIONAL_FILES="lyx.rdef.in"
 
 ARCHITECTURES="?x86_gcc2 ?x86 x86_64"
 SECONDARY_ARCHITECTURES="?x86"
@@ -61,6 +61,7 @@ BUILD_PREREQUIRES="
 	cmd:find
 	cmd:python2.7
 	cmd:pkg_config$secondaryArchSuffix
+	cmd:sed
 	"
 
 BUILD()
@@ -73,8 +74,23 @@ BUILD()
 INSTALL()
 {
 	make install
-	addattr -f lib/images/lyx.hvif -t \'VICN\' BEOS:ICON $binDir/lyx
+
 	mkdir $appsDir
 	mv $binDir/lyx $appsDir/LyX
-	addAppDeskbarSymlink $appsDir/LyX LyX
+
+	local MAJOR="`echo "$portVersion" | cut -d. -f1`"
+	local MIDDLE="`echo "$portVersion" | cut -d. -f2`"
+	local MINOR="`echo "$portVersion" | cut -d. -f3`"
+	local INTERNAL="0"
+	sed \
+		-e "s|@MAJOR@|$MAJOR|" \
+		-e "s|@MIDDLE@|$MIDDLE|" \
+		-e "s|@MINOR@|$MINOR|" \
+		-e "s|@INTERNAL@|$INTERNAL|" \
+		$portDir/additional-files/lyx.rdef.in > lyx.rdef
+
+	addResourcesToBinaries lyx.rdef \
+		$appsDir/LyX
+
+	addAppDeskbarSymlink $appsDir/LyX
 }