From 3ce1c435d7d80194fb93f9e8cd53a875ecc78018 Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Thu, 12 Sep 2019 17:56:47 +0200 Subject: [PATCH 1/8] potrace: Convert to versionless bee file --- potrace-1.13-0.bee => potrace.be0 | 2 ++ 1 file changed, 2 insertions(+) rename potrace-1.13-0.bee => potrace.be0 (98%) diff --git a/potrace-1.13-0.bee b/potrace.be0 similarity index 98% rename from potrace-1.13-0.bee rename to potrace.be0 index 8de588406..e507729d4 100755 --- a/potrace-1.13-0.bee +++ b/potrace.be0 @@ -1,5 +1,7 @@ #!/usr/bin/env beesh +# BEE_VERSION potrace-1.13-0 + ## this file was created by bee init and should be executed to build a ## bee-package. (Additional hints are located at the end of this file.) From ea6ce6ca70f396b1c1cbf4c01d4a596c4bf6bee0 Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Thu, 12 Sep 2019 17:57:41 +0200 Subject: [PATCH 2/8] potrace: Strip trailing space --- potrace.be0 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/potrace.be0 b/potrace.be0 index e507729d4..e387bb528 100755 --- a/potrace.be0 +++ b/potrace.be0 @@ -54,7 +54,7 @@ SRCURL[0]="http://potrace.sourceforge.net/download/${PKGVERSION}/potrace-${PKGVE #} #mee_configure() { -# bee_configure +# bee_configure #} #mee_build() { From 265791916fef898d4e322906256f781543c579e5 Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Thu, 12 Sep 2019 17:58:55 +0200 Subject: [PATCH 3/8] potrace: Use current bee file template --- potrace.be0 | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/potrace.be0 b/potrace.be0 index e387bb528..38baafa7c 100755 --- a/potrace.be0 +++ b/potrace.be0 @@ -18,14 +18,8 @@ SRCURL[0]="http://potrace.sourceforge.net/download/${PKGVERSION}/potrace-${PKGVE # PATCHURL+=() ############################################################################### -## Add filename patterns to the EXCLUDE array of files that should not -## be added to you package but may be present in the image directory. - -# EXCLUDE+=() - -############################################################################### -## Uncomment the next statement, if the software may not be able to be build -## outside the source directory and need to be build inside the source +## Uncomment the next statement, if the software may not be able to be built +## outside the source directory and needs to be built inside the source ## directory. # build_in_sourcedir From 15de4c8aa61202e0e57a93802d93ead2dfc0a8e2 Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Thu, 12 Sep 2019 17:59:35 +0200 Subject: [PATCH 4/8] potrace: Update version from 1.13 to 1.15 No idea, why 1.13 was installed in 2016 in the first place despite 1.15 being available. --- potrace.be0 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/potrace.be0 b/potrace.be0 index 38baafa7c..0fbaec769 100755 --- a/potrace.be0 +++ b/potrace.be0 @@ -1,6 +1,6 @@ #!/usr/bin/env beesh -# BEE_VERSION potrace-1.13-0 +# BEE_VERSION potrace-1.15-0 ## this file was created by bee init and should be executed to build a ## bee-package. (Additional hints are located at the end of this file.) From 11258ef45aed95ec5b116e4562da092ddb06d115 Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Thu, 12 Sep 2019 18:02:52 +0200 Subject: [PATCH 5/8] potrace: Build with libpotrace Inkscape needs this. --with-libpotrace install Potrace library and headers (default: no) Fixes: https://github.molgen.mpg.de/mariux64/pkg-scripts/issues/84 --- potrace.be0 | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/potrace.be0 b/potrace.be0 index 0fbaec769..32df49787 100755 --- a/potrace.be0 +++ b/potrace.be0 @@ -47,9 +47,10 @@ SRCURL[0]="http://potrace.sourceforge.net/download/${PKGVERSION}/potrace-${PKGVE # bee_patch "${@}" #} -#mee_configure() { -# bee_configure -#} +mee_configure() { + bee_configure \ + --with-libpotrace +} #mee_build() { # bee_build From 0ea6227b8ad88e11ae29160a4c7334dab80dd2a2 Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Thu, 12 Sep 2019 18:04:25 +0200 Subject: [PATCH 6/8] potrace: Use a4 as the default papersize This is more common in our environment. --- potrace.be0 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/potrace.be0 b/potrace.be0 index 32df49787..6edcf6d98 100755 --- a/potrace.be0 +++ b/potrace.be0 @@ -49,7 +49,8 @@ SRCURL[0]="http://potrace.sourceforge.net/download/${PKGVERSION}/potrace-${PKGVE mee_configure() { bee_configure \ - --with-libpotrace + --with-libpotrace \ + --enable-a4 } #mee_build() { From 8e401f2190619e6a66deb10bebd8acd9d565eef7 Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Thu, 12 Sep 2019 18:05:20 +0200 Subject: [PATCH 7/8] potrace: Use metric units (centimeters) as default This is more common in our environment. --- potrace.be0 | 1 + 1 file changed, 1 insertion(+) diff --git a/potrace.be0 b/potrace.be0 index 6edcf6d98..220b37f78 100755 --- a/potrace.be0 +++ b/potrace.be0 @@ -50,6 +50,7 @@ SRCURL[0]="http://potrace.sourceforge.net/download/${PKGVERSION}/potrace-${PKGVE mee_configure() { bee_configure \ --with-libpotrace \ + --enable-metric \ --enable-a4 } From 6d71f26eaefe36f065cf58f2deae82fff0038780 Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Thu, 12 Sep 2019 18:08:30 +0200 Subject: [PATCH 8/8] potrace: Do not build static version of library --- potrace.be0 | 1 + 1 file changed, 1 insertion(+) diff --git a/potrace.be0 b/potrace.be0 index 220b37f78..5bfccbe47 100755 --- a/potrace.be0 +++ b/potrace.be0 @@ -49,6 +49,7 @@ SRCURL[0]="http://potrace.sourceforge.net/download/${PKGVERSION}/potrace-${PKGVE mee_configure() { bee_configure \ + --disable-static \ --with-libpotrace \ --enable-metric \ --enable-a4