drawpile: new recipe #2752

hako · 2018-06-30T12:45:30Z

Drawpile works on Haiku, still a wip.

extrowerk · 2018-06-30T17:40:10Z

media-gfx/drawpile/drawpile-2.0.10.recipe

+SOURCE_URI="https://github.com/drawpile/Drawpile/archive/$portVersion.tar.gz"
+CHECKSUM_SHA256="0ff79e9f95ca02ff016eed3118a83ca62e80a1ca93fe11e3fb8ecd22c1fe37a9"
+SOURCE_DIR="Drawpile-$portVersion"
+PATCHES=""


Remove if unneeded.

extrowerk · 2018-06-30T17:40:24Z

media-gfx/drawpile/drawpile-2.0.10.recipe

@@ -0,0 +1,74 @@
+SUMMARY="A collaborative drawing program"
+DESCRIPTION="Drawpile is a drawing program that lets you share\
+ the canvas with other users in real time."


Remove the space at the beginning.

extrowerk · 2018-06-30T17:40:42Z

media-gfx/drawpile/drawpile-2.0.10.recipe

@@ -0,0 +1,74 @@
+SUMMARY="A collaborative drawing program"
+DESCRIPTION="Drawpile is a drawing program that lets you share\


Add a space before that \

extrowerk · 2018-06-30T17:41:02Z

media-gfx/drawpile/drawpile-2.0.10.recipe

+SUMMARY="A collaborative drawing program"
+DESCRIPTION="Drawpile is a drawing program that lets you share\
+ the canvas with other users in real time."
+HOMEPAGE="http://drawpile.net"


media-gfx/drawpile/drawpile-2.0.10.recipe

+	lib:libkf5archive$secondaryArchSuffix
+	lib:libminiupnpc$secondaryArchSuffix
+	lib:libsodium$secondaryArchSuffix
+	lib:libgif$secondaryArchSuffix


extrowerk · 2018-06-30T17:42:27Z

media-gfx/drawpile/drawpile-2.0.10.recipe

+	haiku${secondaryArchSuffix}_devel
+	devel:libkf5archive$secondaryArchSuffix
+	devel:libgif$secondaryArchSuffix
+	devel:libminiupnpc$secondaryArchSuffix


sort them too

extrowerk · 2018-06-30T17:43:13Z

media-gfx/drawpile/drawpile-2.0.10.recipe

+	cmd:g++$secondaryArchSuffix
+	cmd:ld$secondaryArchSuffix
+	cmd:make
+	cmd:qmake$secondaryArchSuffix


if it is cmake based, then it shouldn't need qmake. please check it, and remove it if unneeded.

extrowerk · 2018-06-30T17:44:05Z

media-gfx/drawpile/drawpile-2.0.10.recipe

+	# TODO Add a rdef icon for Drawpile
+	mkdir -p $appsDir/Drawpile
+	cp bin/drawpile $appsDir/Drawpile/Drawpile
+	cp bin/drawpile-srv $appsDir/Drawpile/drawpile-srv	


Remove the trailing whitespace

Nice job nevertheless!

fbrosson

Cosmetic edits

fbrosson · 2018-07-02T21:54:08Z

media-gfx/drawpile/drawpile-2.0.10.recipe

+SUMMARY="A collaborative drawing program"
+DESCRIPTION="Drawpile is a drawing program that lets you share \
+the canvas with other users in real time."
+HOMEPAGE="https://drawpile.net"


-HOMEPAGE="https://drawpile.net" +HOMEPAGE="https://drawpile.net/"

(if you are OK with this tiny change :)
Thanks!

fbrosson · 2018-07-02T21:56:49Z

media-gfx/drawpile/drawpile-2.0.10.recipe

+REVISION="1"
+SOURCE_URI="https://github.com/drawpile/Drawpile/archive/$portVersion.tar.gz"
+CHECKSUM_SHA256="0ff79e9f95ca02ff016eed3118a83ca62e80a1ca93fe11e3fb8ecd22c1fe37a9"
+SOURCE_DIR="Drawpile-$portVersion"


CHECKSUM_SHA256="0ff79e9f95ca02ff016eed3118a83ca62e80a1ca93fe11e3fb8ecd22c1fe37a9" +SOURCE_FILENAME="Drawpile-$portVersion.tar.gz" SOURCE_DIR="Drawpile-$portVersion" + ARCHITECTURES="!x86_gcc2 ?x86 x86_64"

Links:

HaikuPorter-Guidelines#archive-name

HaikuPorter-Guidelines#ordering

fbrosson · 2018-07-02T21:58:13Z

media-gfx/drawpile/drawpile-2.0.10.recipe

+	drawpile$secondaryArchSuffix = $portVersion
+	app:Drawpile = $portVersion
+	"
+


" - REQUIRES="

(We like to have blank lines at some places, but not between PROVIDES and REQUIRES :)

fbrosson · 2018-07-02T21:59:39Z

media-gfx/drawpile/drawpile-2.0.10.recipe

+	devel:libsodium$secondaryArchSuffix
+	devel:libz$secondaryArchSuffix
+	"
+


" - BUILD_PREREQUIRES="

(We like to have blank lines at some places, but not between BUILD_REQUIRES and BUILD_PREREQUIRES :)

media-gfx/drawpile/drawpile-2.0.10.recipe

+TEST()
+{
+	make test
+}


fbrosson

Thanks @hako for the update!

Although BUILD seems OK, INSTALL is failing:

[100%] Linking CXX executable ../../bin/drawpile-srv
[100%] Built target drawpile-srv
Collecting files to be packaged ...
cp: cannot stat 'bin/drawpile': No such file or directory
Warning: Command '['bash', '-c', '. /wrapper-script']' returned non-zero exit status 1
Error: Build has failed - stopping.

(I guess it'll be easy to fix, but can't investigate right now, so I'm marking the PR with a "Request changes" so that it won't be merged before we fix the recipe.)

hako · 2018-08-19T13:16:30Z

Can confirm, I've changed the build path and it built the package successfully.

fbrosson · 2018-08-19T15:16:43Z

media-gfx/drawpile/drawpile-2.0.10.recipe

+
+TEST()
+{
+	make test


Thanks @hako for the update! The app builds fine on both x86_64 and x86_gcc2 (using x86 secondary arch) and is working fine on x86_64.

haikuporter --test drawpile is not working because we're not passing -DTESTS=on to cmake.

To fix this, we can either:

append a -DTESTS=on to the cmake call in BUILD and, in TEST, replace make test by make -C build test

or change TEST to:

TEST() { cd build cmake .. -DCMAKE_EXE_LINKER_FLAGS=-lnetwork -DTESTS=on make $jobArgs make test }

Of course, we can keep BUILD as it is right now and completely drop TEST.

I think scenario 1 would be nice. What do you think? Any other opinions?

I modified and built the script with scenario 1 instead.

fbrosson · 2018-08-20T11:38:11Z

media-gfx/drawpile/drawpile-2.0.10.recipe

+REQUIRES="
+	haiku$secondaryArchSuffix
+	lib:libgif$secondaryArchSuffix
+	lib:libGL$secondaryArchSuffix


Thanks @hako for the update.
I was going to approve and merge the PR but then realized I had forgotten to check the REQUIRES.
It looks like Drawpile does not directly require 2 libs: libGL and libz:

~> objdump -x /system/apps/Drawpile/* | grep NEEDED | sort -iu | grep -Evw 'libroot|libnetwork' NEEDED libgcc_s.so.1 NEEDED libgif.so.7 NEEDED libKF5Archive.so.5 NEEDED libminiupnpc.so.17 NEEDED libQt5Core.so.5 NEEDED libQt5Gui.so.5 NEEDED libQt5Multimedia.so.5 NEEDED libQt5Network.so.5 NEEDED libQt5Sql.so.5 NEEDED libQt5Svg.so.5 NEEDED libQt5Widgets.so.5 NEEDED libsodium.so.23 NEEDED libstdc++.so.6

Although the names are not case-sensitive I think it might be nice to make the caps match, and to explicitly add a few lib:libQt5* which are not yet mentioned:

REQUIRES=" haiku$secondaryArchSuffix lib:libgif$secondaryArchSuffix - lib:libGL$secondaryArchSuffix - lib:libkf5archive$secondaryArchSuffix + lib:libKF5Archive$secondaryArchSuffix lib:libminiupnpc$secondaryArchSuffix lib:libQt5Core$secondaryArchSuffix lib:libQt5Gui$secondaryArchSuffix + lib:libQt5Multimedia$secondaryArchSuffix lib:libQt5Network$secondaryArchSuffix + lib:libQt5Sql$secondaryArchSuffix + lib:libQt5Svg$secondaryArchSuffix + lib:libQt5Widgets$secondaryArchSuffix lib:libsodium$secondaryArchSuffix - lib:libz$secondaryArchSuffix "

I'm checking this right now, with haikuporter -S drawpile.

BTW, don't worry about libgcc_s.so.1 and libstdc++.so.6. haikuporter is not complaining about them, so my guess is that we don't need to mention lib:libgcc_s$secondaryArchSuffix and lib:libstdc++$secondaryArchSuffix.

fbrosson

👍

The comments have been addressed.

drawpile new recipe

817c41b

extrowerk previously requested changes Jun 30, 2018

View reviewed changes

hako added 2 commits June 30, 2018 19:49

made requested changes

5189396

remove more whitespace

cc632d4

fbrosson reviewed Jul 2, 2018

View reviewed changes

additional edits

631765e

fbrosson requested changes Jul 3, 2018

View reviewed changes

fix build path

fa13571

fbrosson reviewed Aug 19, 2018

View reviewed changes

edit test command

54ea8e6

fbrosson reviewed Aug 20, 2018

View reviewed changes

added explicit dependencies

473e5d6

fbrosson approved these changes Aug 21, 2018

View reviewed changes

fbrosson changed the title ~~drawpile: new recipe wip~~ drawpile: new recipe Aug 21, 2018

fbrosson merged commit a3e1dea into haikuports:master Aug 21, 2018

hako deleted the drawpile branch August 21, 2018 16:02

		@@ -0,0 +1,74 @@
		SUMMARY="A collaborative drawing program"
		DESCRIPTION="Drawpile is a drawing program that lets you share\

drawpile: new recipe #2752

drawpile: new recipe #2752

Uh oh!

Conversation

hako commented Jun 30, 2018 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

This comment was marked as outdated.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

fbrosson left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

This comment was marked as outdated.

Uh oh!

fbrosson left a comment

Choose a reason for hiding this comment

Uh oh!

hako commented Aug 19, 2018

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

fbrosson left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

hako commented Jun 30, 2018 •

edited

Loading